Refactor everything to WayofTime.bloodmagic.*
This commit is contained in:
parent
46742a73d1
commit
096ba02450
|
@ -49,8 +49,8 @@ minecraft {
|
|||
runDir = "run"
|
||||
|
||||
replace "@VERSION@", project.version
|
||||
replaceIn "AlchemicalWizardry.java"
|
||||
replaceIn "AlchemicalWizardryAPI.java"
|
||||
replaceIn "BloodMagic.java"
|
||||
replaceIn "BloodMagicAPI.java"
|
||||
|
||||
if (project.hasProperty('mappings_version'))
|
||||
mappings = project.mappings_version
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
package WayofTime.alchemicalWizardry.api.iface;
|
||||
|
||||
public interface ISigil {
|
||||
}
|
|
@ -1,4 +0,0 @@
|
|||
@API(owner = "AlchemicalWizardry", provides = "AlchemicalWizardry|API", apiVersion = "@VERSION@")
|
||||
package WayofTime.alchemicalWizardry.api;
|
||||
|
||||
import net.minecraftforge.fml.common.API;
|
|
@ -1,17 +0,0 @@
|
|||
package WayofTime.alchemicalWizardry.item;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.registry.ModBlocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemBucket;
|
||||
|
||||
public class ItemBucketEssence extends ItemBucket {
|
||||
|
||||
public ItemBucketEssence() {
|
||||
super(ModBlocks.lifeEssence);
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".bucket.lifeEssence");
|
||||
setContainerItem(Items.bucket);
|
||||
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
|
||||
}
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
package WayofTime.alchemicalWizardry;
|
||||
package WayofTime.bloodmagic;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.LogHelper;
|
||||
import WayofTime.alchemicalWizardry.network.AlchemicalWizardryPacketHandler;
|
||||
import WayofTime.alchemicalWizardry.registry.ModBlocks;
|
||||
import WayofTime.alchemicalWizardry.registry.ModEntities;
|
||||
import WayofTime.alchemicalWizardry.registry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.registry.ModPotions;
|
||||
import WayofTime.alchemicalWizardry.proxy.CommonProxy;
|
||||
import WayofTime.alchemicalWizardry.util.handler.EventHandler;
|
||||
import WayofTime.alchemicalWizardry.util.helper.InventoryRenderHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.LogHelper;
|
||||
import WayofTime.bloodmagic.network.AlchemicalWizardryPacketHandler;
|
||||
import WayofTime.bloodmagic.registry.ModBlocks;
|
||||
import WayofTime.bloodmagic.registry.ModEntities;
|
||||
import WayofTime.bloodmagic.registry.ModItems;
|
||||
import WayofTime.bloodmagic.registry.ModPotions;
|
||||
import WayofTime.bloodmagic.proxy.CommonProxy;
|
||||
import WayofTime.bloodmagic.util.handler.EventHandler;
|
||||
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -22,21 +22,21 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
|||
import java.io.File;
|
||||
import java.util.Locale;
|
||||
|
||||
@Mod(modid = AlchemicalWizardry.MODID, name = AlchemicalWizardry.NAME, version = AlchemicalWizardry.VERSION, dependencies = AlchemicalWizardry.DEPEND, guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory")
|
||||
@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.ConfigGuiFactory")
|
||||
@Getter
|
||||
public class AlchemicalWizardry {
|
||||
public class BloodMagic {
|
||||
|
||||
public static final String MODID = "AlchemicalWizardry";
|
||||
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 = "";
|
||||
public static final String DOMAIN = MODID.toLowerCase(Locale.ENGLISH) + ":";
|
||||
|
||||
@SidedProxy(serverSide = "WayofTime.alchemicalWizardry.proxy.CommonProxy", clientSide = "WayofTime.alchemicalWizardry.proxy.ClientProxy")
|
||||
@SidedProxy(serverSide = "WayofTime.bloodmagic.proxy.CommonProxy", clientSide = "WayofTime.bloodmagic.proxy.ClientProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
@Mod.Instance(MODID)
|
||||
public static AlchemicalWizardry instance;
|
||||
public static BloodMagic instance;
|
||||
|
||||
public static CreativeTabs tabBloodMagic = new CreativeTabs(MODID + ".creativeTab") {
|
||||
@Override
|
|
@ -1,9 +1,9 @@
|
|||
package WayofTime.alchemicalWizardry;
|
||||
package WayofTime.bloodmagic;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.BlockStack;
|
||||
import WayofTime.alchemicalWizardry.registry.ModPotions;
|
||||
import WayofTime.alchemicalWizardry.util.Utils;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import WayofTime.bloodmagic.registry.ModPotions;
|
||||
import WayofTime.bloodmagic.util.Utils;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
@ -161,7 +161,7 @@ public class ConfigHandler {
|
|||
|
||||
category = "General";
|
||||
config.addCustomCategoryComment(category, "General settings");
|
||||
AlchemicalWizardryAPI.setLoggingEnabled(config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this"));
|
||||
BloodMagicAPI.setLoggingEnabled(config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this"));
|
||||
|
||||
config.save();
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
package WayofTime.alchemicalWizardry.altar;
|
||||
package WayofTime.bloodmagic.altar;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.BlockStack;
|
||||
import WayofTime.alchemicalWizardry.api.altar.AltarComponent;
|
||||
import WayofTime.alchemicalWizardry.api.altar.IAltarComponent;
|
||||
import WayofTime.alchemicalWizardry.api.altar.EnumAltarComponent;
|
||||
import WayofTime.alchemicalWizardry.api.altar.EnumAltarTier;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import WayofTime.bloodmagic.api.altar.AltarComponent;
|
||||
import WayofTime.bloodmagic.api.altar.IAltarComponent;
|
||||
import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
|
||||
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
|
||||
import net.minecraft.block.BlockBeacon;
|
||||
import net.minecraft.block.BlockGlowstone;
|
||||
import net.minecraft.init.Blocks;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api;
|
||||
package WayofTime.bloodmagic.api;
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
|
@ -1,19 +1,19 @@
|
|||
package WayofTime.alchemicalWizardry.api;
|
||||
package WayofTime.bloodmagic.api;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.LogHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.LogHelper;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
public class AlchemicalWizardryAPI {
|
||||
public class BloodMagicAPI {
|
||||
|
||||
@Getter @Setter
|
||||
private static boolean loggingEnabled;
|
||||
|
||||
@Getter
|
||||
private static LogHelper logger = new LogHelper("AlchemicalWizardry|API");
|
||||
private static LogHelper logger = new LogHelper("BloodMagic|API");
|
||||
|
||||
@Getter
|
||||
private static DamageSource damageSource = new DamageSourceBloodMagic();
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api;
|
||||
package WayofTime.bloodmagic.api;
|
||||
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api;
|
||||
package WayofTime.bloodmagic.api;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.BlockStack;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
import lombok.Getter;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -13,7 +13,7 @@ public class AltarRecipe {
|
|||
public final ItemStack input, output;
|
||||
|
||||
/**
|
||||
* Allows creation of a recipe for the {@link WayofTime.alchemicalWizardry.block.BlockAltar} / {@link WayofTime.alchemicalWizardry.tile.TileAltar}.
|
||||
* 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
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
import lombok.Getter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
public enum EnumAltarComponent {
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.BlockStack;
|
||||
import WayofTime.alchemicalWizardry.api.altar.AltarComponent;
|
||||
import WayofTime.alchemicalWizardry.registry.ModBlocks;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import WayofTime.bloodmagic.registry.ModBlocks;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.BlockPos;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
public interface IAltarComponent {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.altar;
|
||||
package WayofTime.bloodmagic.api.altar;
|
||||
|
||||
public interface IBloodAltar {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.event;
|
||||
package WayofTime.bloodmagic.api.event;
|
||||
|
||||
import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.event;
|
||||
package WayofTime.bloodmagic.api.event;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,9 +1,9 @@
|
|||
package WayofTime.alchemicalWizardry.api.event;
|
||||
package WayofTime.bloodmagic.api.event;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.Ritual;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.IImperfectRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.ImperfectRitual;
|
||||
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 net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.eventhandler.Cancelable;
|
||||
|
@ -24,7 +24,7 @@ public class RitualEvent extends Event {
|
|||
/**
|
||||
* This event is called when a ritual is activated. If cancelled, it will not activate.
|
||||
*
|
||||
* {@link WayofTime.alchemicalWizardry.api.util.helper.RitualHelper#activate(IMasterRitualStone, Ritual, EntityPlayer)}
|
||||
* {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#activate(IMasterRitualStone, Ritual, EntityPlayer)}
|
||||
*/
|
||||
@Cancelable
|
||||
public static class RitualActivatedEvent extends RitualEvent {
|
||||
|
@ -44,7 +44,7 @@ public class RitualEvent extends Event {
|
|||
/**
|
||||
* This event is called when a Ritual effect is performed. If cancelled, the effect will not happen.
|
||||
*
|
||||
* {@link WayofTime.alchemicalWizardry.api.util.helper.RitualHelper#perform(IMasterRitualStone, Ritual)}
|
||||
* {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#perform(IMasterRitualStone, Ritual)}
|
||||
*/
|
||||
@Cancelable
|
||||
public static class RitualRunEvent extends RitualEvent {
|
||||
|
@ -57,7 +57,7 @@ public class RitualEvent extends Event {
|
|||
/**
|
||||
* This event is called when a Ritual is stopped by a {@link Ritual.BreakType}.
|
||||
*
|
||||
* {@link WayofTime.alchemicalWizardry.api.util.helper.RitualHelper#stop(IMasterRitualStone, Ritual, Ritual.BreakType)}
|
||||
* {@link WayofTime.bloodmagic.api.util.helper.RitualHelper#stop(IMasterRitualStone, Ritual, Ritual.BreakType)}
|
||||
*/
|
||||
public static class RitualStopEvent extends RitualEvent {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.event;
|
||||
package WayofTime.bloodmagic.api.event;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.iface;
|
||||
package WayofTime.bloodmagic.api.iface;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
4
src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java
Normal file
4
src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java
Normal file
|
@ -0,0 +1,4 @@
|
|||
package WayofTime.bloodmagic.api.iface;
|
||||
|
||||
public interface ISigil {
|
||||
}
|
|
@ -1,14 +1,13 @@
|
|||
package WayofTime.alchemicalWizardry.api.network;
|
||||
package WayofTime.bloodmagic.api.network;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.event.SoulNetworkEvent;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.PlayerHelper;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
|
||||
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldSavedData;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
|
@ -71,7 +70,7 @@ public class SoulNetwork extends WorldSavedData {
|
|||
player.setHealth((player.getHealth() - 1));
|
||||
|
||||
if (player.getHealth() <= 0.0005f)
|
||||
player.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
player.onDeath(BloodMagicAPI.getDamageSource());
|
||||
}
|
||||
} else if (syphon >= 100) {
|
||||
if (!player.capabilities.isCreativeMode) {
|
||||
|
@ -79,7 +78,7 @@ public class SoulNetwork extends WorldSavedData {
|
|||
player.setHealth((player.getHealth() - 1));
|
||||
|
||||
if (player.getHealth() <= 0.0005f) {
|
||||
player.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
player.onDeath(BloodMagicAPI.getDamageSource());
|
||||
break;
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.orb;
|
||||
package WayofTime.bloodmagic.api.orb;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.registry.OrbRegistry;
|
||||
import WayofTime.bloodmagic.api.registry.OrbRegistry;
|
||||
|
||||
/**
|
||||
* Base object for all Blood Orbs. Makes Orb creation quite a bit easier.
|
||||
|
@ -15,7 +15,7 @@ public class BloodOrb {
|
|||
private String name;
|
||||
private int tier;
|
||||
private int capacity;
|
||||
private String owner = "AlchemicalWizardry";
|
||||
private String owner = "BloodMagic";
|
||||
|
||||
/**
|
||||
* A base object for BloodOrbs. A bit cleaner than the
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.orb;
|
||||
package WayofTime.bloodmagic.api.orb;
|
||||
|
||||
public interface IBloodOrb {
|
||||
|
4
src/main/java/WayofTime/bloodmagic/api/package-info.java
Normal file
4
src/main/java/WayofTime/bloodmagic/api/package-info.java
Normal file
|
@ -0,0 +1,4 @@
|
|||
@API(owner = "BloodMagic", provides = "BloodMagic|API", apiVersion = "@VERSION@")
|
||||
package WayofTime.bloodmagic.api;
|
||||
|
||||
import net.minecraftforge.fml.common.API;
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.api.registry;
|
||||
package WayofTime.bloodmagic.api.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.altar.AltarRecipe;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.altar.AltarRecipe;
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import lombok.Getter;
|
||||
|
@ -16,7 +16,7 @@ public class AltarRecipeRegistry {
|
|||
if (!recipes.containsValue(recipe))
|
||||
recipes.put(recipe.input, recipe);
|
||||
else
|
||||
AlchemicalWizardryAPI.getLogger().error("Error adding recipe for " + recipe.input.getDisplayName() + (recipe.output == null ? "" : " -> " + recipe.output.getDisplayName()) + ". Recipe already exists.");
|
||||
BloodMagicAPI.getLogger().error("Error adding recipe for " + recipe.input.getDisplayName() + (recipe.output == null ? "" : " -> " + recipe.output.getDisplayName()) + ". Recipe already exists.");
|
||||
}
|
||||
|
||||
public static AltarRecipe getRecipeForInput(ItemStack input) {
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.api.registry;
|
||||
package WayofTime.bloodmagic.api.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.ImperfectRitual;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
|
||||
|
@ -21,7 +21,7 @@ public class ImperfectRitualRegistry {
|
|||
public static void registerRitual(ImperfectRitual imperfectRitual, String id) {
|
||||
if (imperfectRitual != null) {
|
||||
if (registry.containsKey(id))
|
||||
AlchemicalWizardryAPI.getLogger().error("Duplicate imperfect ritual id: " + id);
|
||||
BloodMagicAPI.getLogger().error("Duplicate imperfect ritual id: " + id);
|
||||
else
|
||||
registry.put(id, imperfectRitual);
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.api.registry;
|
||||
package WayofTime.bloodmagic.api.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.orb.BloodOrb;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.orb.BloodOrb;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.client.resources.model.ModelBakery;
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
|
@ -26,15 +26,15 @@ public class OrbRegistry {
|
|||
if (!orbs.contains(orb))
|
||||
orbs.add(orb);
|
||||
else
|
||||
AlchemicalWizardryAPI.getLogger().error("Error adding orb: " + orb.toString() + ". Orb already exists!");
|
||||
BloodMagicAPI.getLogger().error("Error adding orb: " + orb.toString() + ". Orb already exists!");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void registerOrbTexture(BloodOrb orb, String resourceLocation) {
|
||||
int meta = getIndexOf(orb);
|
||||
|
||||
ModelBakery.addVariantName(AlchemicalWizardryAPI.getOrbItem(), resourceLocation);
|
||||
ModelLoader.setCustomModelResourceLocation(AlchemicalWizardryAPI.getOrbItem(), meta, new ModelResourceLocation(resourceLocation, "inventory"));
|
||||
ModelBakery.addVariantName(BloodMagicAPI.getOrbItem(), resourceLocation);
|
||||
ModelLoader.setCustomModelResourceLocation(BloodMagicAPI.getOrbItem(), meta, new ModelResourceLocation(resourceLocation, "inventory"));
|
||||
}
|
||||
|
||||
public static BloodOrb getOrb(int index) {
|
||||
|
@ -54,6 +54,6 @@ public class OrbRegistry {
|
|||
}
|
||||
|
||||
public static ItemStack getOrbStack(BloodOrb orb) {
|
||||
return new ItemStack(AlchemicalWizardryAPI.getOrbItem(), 1, getIndexOf(orb));
|
||||
return new ItemStack(BloodMagicAPI.getOrbItem(), 1, getIndexOf(orb));
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.api.registry;
|
||||
package WayofTime.bloodmagic.api.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import java.util.ArrayList;
|
||||
|
@ -20,7 +20,7 @@ public class RitualRegistry {
|
|||
public static void registerRitual(Ritual ritual, String id) {
|
||||
if (ritual != null) {
|
||||
if (registry.containsKey(id))
|
||||
AlchemicalWizardryAPI.getLogger().error("Duplicate ritual id: " + id);
|
||||
BloodMagicAPI.getLogger().error("Duplicate ritual id: " + id);
|
||||
else
|
||||
registry.put(id, ritual);
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.IImperfectRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual;
|
||||
package WayofTime.bloodmagic.api.ritual;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.ResourceLocation;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual.imperfect;
|
||||
package WayofTime.bloodmagic.api.ritual.imperfect;
|
||||
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.ritual.imperfect;
|
||||
package WayofTime.bloodmagic.api.ritual.imperfect;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.BlockStack;
|
||||
import WayofTime.bloodmagic.api.BlockStack;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package WayofTime.alchemicalWizardry.api.util.helper;
|
||||
package WayofTime.bloodmagic.api.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.event.ItemBindEvent;
|
||||
import WayofTime.alchemicalWizardry.api.iface.IBindable;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.event.ItemBindEvent;
|
||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||
import com.google.common.base.Strings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.util.helper;
|
||||
package WayofTime.bloodmagic.api.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
|
@ -13,17 +13,17 @@ public class LogHelper {
|
|||
}
|
||||
|
||||
public void info(Object info) {
|
||||
if (AlchemicalWizardryAPI.isLoggingEnabled())
|
||||
if (BloodMagicAPI.isLoggingEnabled())
|
||||
logger.info(info);
|
||||
}
|
||||
|
||||
public void error(Object error) {
|
||||
if (AlchemicalWizardryAPI.isLoggingEnabled())
|
||||
if (BloodMagicAPI.isLoggingEnabled())
|
||||
logger.info(error);
|
||||
}
|
||||
|
||||
public void debug(Object debug) {
|
||||
if (AlchemicalWizardryAPI.isLoggingEnabled())
|
||||
if (BloodMagicAPI.isLoggingEnabled())
|
||||
logger.info(debug);
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package WayofTime.alchemicalWizardry.api.util.helper;
|
||||
package WayofTime.bloodmagic.api.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.event.AddToNetworkEvent;
|
||||
import WayofTime.alchemicalWizardry.api.event.SoulNetworkEvent;
|
||||
import WayofTime.alchemicalWizardry.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
|
||||
import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import com.google.common.base.Strings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -174,7 +174,7 @@ public class NetworkHelper {
|
|||
user.setHealth((user.getHealth() - 1));
|
||||
|
||||
if (user.getHealth() <= 0.0005f)
|
||||
user.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
user.onDeath(BloodMagicAPI.getDamageSource());
|
||||
}
|
||||
} else if (energySyphoned >= 100) {
|
||||
if (!user.capabilities.isCreativeMode) {
|
||||
|
@ -182,7 +182,7 @@ public class NetworkHelper {
|
|||
user.setHealth((user.getHealth() - 1));
|
||||
|
||||
if (user.getHealth() <= 0.0005f) {
|
||||
user.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
user.onDeath(BloodMagicAPI.getDamageSource());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -195,7 +195,7 @@ public class NetworkHelper {
|
|||
user.setHealth((user.getHealth() - damage));
|
||||
|
||||
if (user.getHealth() <= 0.0005f)
|
||||
user.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
user.onDeath(BloodMagicAPI.getDamageSource());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.api.util.helper;
|
||||
package WayofTime.bloodmagic.api.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import com.google.common.base.Strings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,11 +1,11 @@
|
|||
package WayofTime.alchemicalWizardry.api.util.helper;
|
||||
package WayofTime.bloodmagic.api.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.event.RitualEvent;
|
||||
import WayofTime.alchemicalWizardry.api.registry.RitualRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.Ritual;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.IImperfectRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.imperfect.ImperfectRitual;
|
||||
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.ritual.imperfect.IImperfectRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Configuration;
|
|
@ -1,7 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.block;
|
||||
package WayofTime.bloodmagic.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.tile.TileAltar;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -12,8 +11,8 @@ public class BlockAltar extends BlockContainer {
|
|||
public BlockAltar() {
|
||||
super(Material.rock);
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".altar");
|
||||
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
|
||||
setUnlocalizedName(BloodMagic.MODID + ".altar");
|
||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
||||
}
|
||||
|
||||
@Override
|
|
@ -1,8 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.block;
|
||||
package WayofTime.bloodmagic.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import lombok.AccessLevel;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.BlockPos;
|
||||
|
@ -24,10 +23,10 @@ public class BlockLifeEssence extends BlockFluidClassic {
|
|||
public BlockLifeEssence() {
|
||||
super(lifeEssence, Material.water);
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".fluid.lifeEssence");
|
||||
setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence");
|
||||
|
||||
lifeEssence.setBlock(this);
|
||||
AlchemicalWizardryAPI.setLifeEssence(lifeEssence);
|
||||
BloodMagicAPI.setLifeEssence(lifeEssence);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -43,7 +42,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
|
|||
public static class FluidLifeEssence extends Fluid {
|
||||
|
||||
public FluidLifeEssence() {
|
||||
super("lifeEssence", new ResourceLocation(AlchemicalWizardry.DOMAIN + "blocks/lifeEssenceStill"), new ResourceLocation(AlchemicalWizardry.DOMAIN + "blocks/lifeEssenceFlowing"));
|
||||
super("lifeEssence", new ResourceLocation(BloodMagic.DOMAIN + "blocks/lifeEssenceStill"), new ResourceLocation(BloodMagic.DOMAIN + "blocks/lifeEssenceFlowing"));
|
||||
|
||||
setDensity(2000);
|
||||
setViscosity(2000);
|
||||
|
@ -56,7 +55,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
|
|||
|
||||
@Override
|
||||
public String getLocalizedName(FluidStack fluidStack) {
|
||||
return StatCollector.translateToLocal("tile.AlchemicalWizardry.fluid.lifeEssence.name");
|
||||
return StatCollector.translateToLocal("tile.BloodMagic.fluid.lifeEssence.name");
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,7 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.block;
|
||||
package WayofTime.bloodmagic.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import net.minecraft.block.Block;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.PropertyInteger;
|
||||
|
@ -28,8 +27,8 @@ public class BlockRitualController extends BlockContainer {
|
|||
public BlockRitualController() {
|
||||
super(Material.rock);
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".stone.ritual.");
|
||||
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
|
||||
setUnlocalizedName(BloodMagic.MODID + ".stone.ritual.");
|
||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
||||
setStepSound(soundTypeStone);
|
||||
setHardness(2.0F);
|
||||
setHarvestLevel("pickaxe", 2);
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.client.gui;
|
||||
package WayofTime.bloodmagic.client.gui;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.ConfigHandler;
|
||||
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;
|
||||
|
@ -13,7 +13,7 @@ import java.util.List;
|
|||
public class ConfigGui extends GuiConfig {
|
||||
|
||||
public ConfigGui(GuiScreen parentScreen) {
|
||||
super(parentScreen, getConfigElements(parentScreen), AlchemicalWizardry.MODID, false, false, "BloodMagic Configuration");
|
||||
super(parentScreen, getConfigElements(parentScreen), BloodMagic.MODID, false, false, "BloodMagic Configuration");
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.client.gui;
|
||||
package WayofTime.bloodmagic.client.gui;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.item;
|
||||
package WayofTime.bloodmagic.item;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.util.helper.TextHelper;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -18,7 +18,7 @@ public class ItemActivationCrystal extends ItemBindable {
|
|||
public ItemActivationCrystal() {
|
||||
super();
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".activationCrystal.");
|
||||
setUnlocalizedName(BloodMagic.MODID + ".activationCrystal.");
|
||||
setHasSubtypes(true);
|
||||
setEnergyUsed(100);
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ public class ItemActivationCrystal extends ItemBindable {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@SuppressWarnings("unchecked")
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
tooltip.add(TextHelper.localize("tooltip.AlchemicalWizardry.activationCrystal." + names[stack.getItemDamage()]));
|
||||
tooltip.add(TextHelper.localize("tooltip.BloodMagic.activationCrystal." + names[stack.getItemDamage()]));
|
||||
|
||||
super.addInformation(stack, player, tooltip, advanced);
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package WayofTime.alchemicalWizardry.item;
|
||||
package WayofTime.bloodmagic.item;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.iface.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.BindableHelper;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.NetworkHelper;
|
||||
import WayofTime.alchemicalWizardry.util.helper.TextHelper;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import com.google.common.base.Strings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -28,7 +28,7 @@ public class ItemBindable extends Item implements IBindable {
|
|||
public ItemBindable() {
|
||||
super();
|
||||
|
||||
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
|
||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
||||
setMaxStackSize(1);
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ public class ItemBindable extends Item implements IBindable {
|
|||
NBTHolder.checkNBT(stack);
|
||||
|
||||
if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(NBTHolder.NBT_OWNER)))
|
||||
tooltip.add(TextHelper.getFormattedText(String.format(StatCollector.translateToLocal("tooltip.AlchemicalWizardry.currentOwner"), stack.getTagCompound().getString(NBTHolder.NBT_OWNER))));
|
||||
tooltip.add(TextHelper.getFormattedText(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.currentOwner"), stack.getTagCompound().getString(NBTHolder.NBT_OWNER))));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -73,20 +73,20 @@ public class ItemBindable extends Item implements IBindable {
|
|||
public static void hurtPlayer(EntityPlayer user, int energySyphoned) {
|
||||
if (energySyphoned < 100 && energySyphoned > 0) {
|
||||
if (!user.capabilities.isCreativeMode) {
|
||||
user.attackEntityFrom(AlchemicalWizardryAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
user.setHealth(user.getHealth() - 1);
|
||||
|
||||
if (user.getHealth() <= 0.0005f)
|
||||
user.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
user.onDeath(BloodMagicAPI.getDamageSource());
|
||||
}
|
||||
} else if (energySyphoned >= 100) {
|
||||
if (!user.capabilities.isCreativeMode) {
|
||||
for (int i = 0; i < ((energySyphoned + 99) / 100); i++) {
|
||||
user.attackEntityFrom(AlchemicalWizardryAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
user.setHealth(user.getHealth() - 1);
|
||||
|
||||
if (user.getHealth() <= 0.0005f) {
|
||||
user.onDeath(AlchemicalWizardryAPI.getDamageSource());
|
||||
user.onDeath(BloodMagicAPI.getDamageSource());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ public class ItemBindable extends Item implements IBindable {
|
|||
world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3);
|
||||
}
|
||||
for (int i = 0; i < damage; i++) {
|
||||
player.attackEntityFrom(AlchemicalWizardryAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0F); // Emulate an attack
|
||||
player.setHealth(player.getHealth() - 1);
|
||||
|
||||
if (player.getHealth() <= 0.0005) {
|
|
@ -1,13 +1,13 @@
|
|||
package WayofTime.alchemicalWizardry.item;
|
||||
package WayofTime.bloodmagic.item;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.iface.IBindable;
|
||||
import WayofTime.alchemicalWizardry.api.orb.BloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.orb.IBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.registry.OrbRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.NetworkHelper;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.PlayerHelper;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.iface.IBindable;
|
||||
import WayofTime.bloodmagic.api.orb.BloodOrb;
|
||||
import WayofTime.bloodmagic.api.orb.IBloodOrb;
|
||||
import WayofTime.bloodmagic.api.registry.OrbRegistry;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
|
||||
import com.google.common.base.Strings;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -23,7 +23,7 @@ import java.util.List;
|
|||
public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable {
|
||||
|
||||
public ItemBloodOrb() {
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".orb.");
|
||||
setUnlocalizedName(BloodMagic.MODID + ".orb.");
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
|
@ -74,10 +74,10 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@SuppressWarnings("unchecked")
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
tooltip.add(StatCollector.translateToLocal("tooltip.AlchemicalWizardry.orb.desc"));
|
||||
tooltip.add(StatCollector.translateToLocal("tooltip.BloodMagic.orb.desc"));
|
||||
|
||||
if (advanced)
|
||||
tooltip.add(String.format(StatCollector.translateToLocal("tooltip.AlchemicalWizardry.orb.owner"), getOrb(stack.getItemDamage()).getOwner()));
|
||||
tooltip.add(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.orb.owner"), getOrb(stack.getItemDamage()).getOwner()));
|
||||
|
||||
super.addInformation(stack, player, tooltip, advanced);
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
package WayofTime.bloodmagic.item;
|
||||
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.registry.ModBlocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemBucket;
|
||||
|
||||
public class ItemBucketEssence extends ItemBucket {
|
||||
|
||||
public ItemBucketEssence() {
|
||||
super(ModBlocks.lifeEssence);
|
||||
|
||||
setUnlocalizedName(BloodMagic.MODID + ".bucket.lifeEssence");
|
||||
setContainerItem(Items.bucket);
|
||||
setCreativeTab(BloodMagic.tabBloodMagic);
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.item.block;
|
||||
package WayofTime.bloodmagic.item.block;
|
||||
|
||||
import WayofTime.alchemicalWizardry.block.BlockRitualController;
|
||||
import WayofTime.bloodmagic.block.BlockRitualController;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,10 +1,10 @@
|
|||
package WayofTime.alchemicalWizardry.item.sigil;
|
||||
package WayofTime.bloodmagic.item.sigil;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.iface.ISigil;
|
||||
import WayofTime.alchemicalWizardry.util.helper.TextHelper;
|
||||
import WayofTime.alchemicalWizardry.item.ItemBindable;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.iface.ISigil;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import WayofTime.bloodmagic.item.ItemBindable;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -27,11 +27,11 @@ public class ItemSigilBase extends ItemBindable implements ISigil {
|
|||
public ItemSigilBase(String name, int energyUsed) {
|
||||
super();
|
||||
|
||||
setUnlocalizedName(AlchemicalWizardry.MODID + ".sigil." + name);
|
||||
setUnlocalizedName(BloodMagic.MODID + ".sigil." + name);
|
||||
setEnergyUsed(energyUsed);
|
||||
|
||||
this.name = name;
|
||||
this.tooltipBase = "tooltip.AlchemicalWizardry.sigil." + name + ".";
|
||||
this.tooltipBase = "tooltip.BloodMagic.sigil." + name + ".";
|
||||
}
|
||||
|
||||
public ItemSigilBase(String name) {
|
|
@ -1,10 +1,10 @@
|
|||
package WayofTime.alchemicalWizardry.item.sigil;
|
||||
package WayofTime.bloodmagic.item.sigil;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altar.IBloodAltar;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.BindableHelper;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.NetworkHelper;
|
||||
import WayofTime.alchemicalWizardry.util.ChatUtil;
|
||||
import WayofTime.alchemicalWizardry.util.helper.TextHelper;
|
||||
import WayofTime.bloodmagic.api.altar.IBloodAltar;
|
||||
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.util.ChatUtil;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.network;
|
||||
package WayofTime.bloodmagic.network;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.util.ChatUtil;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.util.ChatUtil;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||
|
@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
|
||||
public class AlchemicalWizardryPacketHandler {
|
||||
|
||||
public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(AlchemicalWizardry.MODID);
|
||||
public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(BloodMagic.MODID);
|
||||
|
||||
public static void init() {
|
||||
INSTANCE.registerMessage(ChatUtil.PacketNoSpamChat.Handler.class, ChatUtil.PacketNoSpamChat.class, 0, Side.CLIENT);
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.proxy;
|
||||
package WayofTime.bloodmagic.proxy;
|
||||
|
||||
import WayofTime.alchemicalWizardry.registry.ModBlocks;
|
||||
import WayofTime.alchemicalWizardry.registry.ModItems;
|
||||
import WayofTime.bloodmagic.registry.ModBlocks;
|
||||
import WayofTime.bloodmagic.registry.ModItems;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.proxy;
|
||||
package WayofTime.bloodmagic.proxy;
|
||||
|
||||
public class CommonProxy {
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package WayofTime.alchemicalWizardry.registry;
|
||||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.ConfigHandler;
|
||||
import WayofTime.alchemicalWizardry.block.BlockAltar;
|
||||
import WayofTime.alchemicalWizardry.block.BlockLifeEssence;
|
||||
import WayofTime.alchemicalWizardry.block.BlockRitualController;
|
||||
import WayofTime.alchemicalWizardry.item.block.ItemBlockRitualHome;
|
||||
import WayofTime.alchemicalWizardry.util.helper.InventoryRenderHelper;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.ConfigHandler;
|
||||
import WayofTime.bloodmagic.block.BlockAltar;
|
||||
import WayofTime.bloodmagic.block.BlockLifeEssence;
|
||||
import WayofTime.bloodmagic.block.BlockRitualController;
|
||||
import WayofTime.bloodmagic.item.block.ItemBlockRitualHome;
|
||||
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
@ -38,7 +38,7 @@ public class ModBlocks {
|
|||
}
|
||||
|
||||
public static void initRenders() {
|
||||
InventoryRenderHelper renderHelper = AlchemicalWizardry.instance.getRenderHelper();
|
||||
InventoryRenderHelper renderHelper = BloodMagic.instance.getRenderHelper();
|
||||
|
||||
renderHelper.fluidRender(lifeEssence);
|
||||
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 0);
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.registry;
|
||||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
public class ModEntities {
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
package WayofTime.alchemicalWizardry.registry;
|
||||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.ConfigHandler;
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.orb.BloodOrb;
|
||||
import WayofTime.alchemicalWizardry.api.registry.OrbRegistry;
|
||||
import WayofTime.alchemicalWizardry.item.ItemActivationCrystal;
|
||||
import WayofTime.alchemicalWizardry.item.ItemBloodOrb;
|
||||
import WayofTime.alchemicalWizardry.item.ItemBucketEssence;
|
||||
import WayofTime.alchemicalWizardry.item.sigil.ItemSigilDivination;
|
||||
import WayofTime.alchemicalWizardry.util.helper.InventoryRenderHelper;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.ConfigHandler;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.orb.BloodOrb;
|
||||
import WayofTime.bloodmagic.api.registry.OrbRegistry;
|
||||
import WayofTime.bloodmagic.item.ItemActivationCrystal;
|
||||
import WayofTime.bloodmagic.item.ItemBloodOrb;
|
||||
import WayofTime.bloodmagic.item.ItemBucketEssence;
|
||||
import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
|
||||
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
|
@ -31,7 +31,7 @@ public class ModItems {
|
|||
|
||||
public static void init() {
|
||||
bloodOrb = registerItem(new ItemBloodOrb());
|
||||
AlchemicalWizardryAPI.setOrbItem(bloodOrb);
|
||||
BloodMagicAPI.setOrbItem(bloodOrb);
|
||||
orbWeak = new BloodOrb("weak", 1, 5000);
|
||||
OrbRegistry.registerOrb(orbWeak);
|
||||
orbApprentice = new BloodOrb("apprentice", 2, 25000);
|
||||
|
@ -53,15 +53,15 @@ public class ModItems {
|
|||
}
|
||||
|
||||
public static void initRenders() {
|
||||
InventoryRenderHelper renderHelper = AlchemicalWizardry.instance.getRenderHelper();
|
||||
InventoryRenderHelper renderHelper = BloodMagic.instance.getRenderHelper();
|
||||
|
||||
renderHelper.itemRenderAll(bloodOrb);
|
||||
OrbRegistry.registerOrbTexture(orbWeak, AlchemicalWizardry.DOMAIN + "ItemBloodOrbWeak");
|
||||
OrbRegistry.registerOrbTexture(orbApprentice, AlchemicalWizardry.DOMAIN + "ItemBloodOrbApprentice");
|
||||
OrbRegistry.registerOrbTexture(orbMagician, AlchemicalWizardry.DOMAIN + "ItemBloodOrbMagician");
|
||||
OrbRegistry.registerOrbTexture(orbMaster, AlchemicalWizardry.DOMAIN + "ItemBloodOrbMaster");
|
||||
OrbRegistry.registerOrbTexture(orbArchmage, AlchemicalWizardry.DOMAIN + "ItemBloodOrbArchmage");
|
||||
OrbRegistry.registerOrbTexture(orbTranscendent, AlchemicalWizardry.DOMAIN + "ItemBloodOrbTranscendent");
|
||||
OrbRegistry.registerOrbTexture(orbWeak, BloodMagic.DOMAIN + "ItemBloodOrbWeak");
|
||||
OrbRegistry.registerOrbTexture(orbApprentice, BloodMagic.DOMAIN + "ItemBloodOrbApprentice");
|
||||
OrbRegistry.registerOrbTexture(orbMagician, BloodMagic.DOMAIN + "ItemBloodOrbMagician");
|
||||
OrbRegistry.registerOrbTexture(orbMaster, BloodMagic.DOMAIN + "ItemBloodOrbMaster");
|
||||
OrbRegistry.registerOrbTexture(orbArchmage, BloodMagic.DOMAIN + "ItemBloodOrbArchmage");
|
||||
OrbRegistry.registerOrbTexture(orbTranscendent, BloodMagic.DOMAIN + "ItemBloodOrbTranscendent");
|
||||
|
||||
renderHelper.itemRender(bucketEssence);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.registry;
|
||||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
public class ModPotions {
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.tile;
|
||||
package WayofTime.bloodmagic.tile;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI;
|
||||
import WayofTime.alchemicalWizardry.api.altar.AltarUpgrade;
|
||||
import WayofTime.bloodmagic.api.BloodMagicAPI;
|
||||
import WayofTime.bloodmagic.api.altar.AltarUpgrade;
|
||||
import net.minecraft.server.gui.IUpdatePlayerListBox;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.fluids.*;
|
||||
|
@ -10,7 +10,7 @@ public class TileAltar extends TileInventory implements IUpdatePlayerListBox, IF
|
|||
|
||||
private int tier;
|
||||
private AltarUpgrade upgrade = new AltarUpgrade();
|
||||
private FluidStack fluid = new FluidStack(AlchemicalWizardryAPI.getLifeEssence(), 0);
|
||||
private FluidStack fluid = new FluidStack(BloodMagicAPI.getLifeEssence(), 0);
|
||||
private int capacity;
|
||||
|
||||
public TileAltar() {
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.tile;
|
||||
package WayofTime.bloodmagic.tile;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -109,7 +109,7 @@ public class TileInventory extends TileEntity implements IInventory {
|
|||
|
||||
@Override
|
||||
public String getName() {
|
||||
return StatCollector.translateToLocal("tile.AlchemicalWizardry." + name + ".name");
|
||||
return StatCollector.translateToLocal("tile.BloodMagic." + name + ".name");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -119,6 +119,6 @@ public class TileInventory extends TileEntity implements IInventory {
|
|||
|
||||
@Override
|
||||
public IChatComponent getDisplayName() {
|
||||
return new ChatComponentTranslation("tile.AlchemicalWizardry." + name + ".name");
|
||||
return new ChatComponentTranslation("tile.BloodMagic." + name + ".name");
|
||||
}
|
||||
}
|
|
@ -1,15 +1,15 @@
|
|||
package WayofTime.alchemicalWizardry.tile;
|
||||
package WayofTime.bloodmagic.tile;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.NBTHolder;
|
||||
import WayofTime.alchemicalWizardry.api.event.RitualEvent;
|
||||
import WayofTime.alchemicalWizardry.api.network.SoulNetwork;
|
||||
import WayofTime.alchemicalWizardry.api.registry.RitualRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.LocalRitualStorage;
|
||||
import WayofTime.alchemicalWizardry.api.ritual.Ritual;
|
||||
import WayofTime.alchemicalWizardry.api.util.helper.NetworkHelper;
|
||||
import WayofTime.alchemicalWizardry.item.ItemActivationCrystal;
|
||||
import WayofTime.alchemicalWizardry.util.ChatUtil;
|
||||
import WayofTime.bloodmagic.api.NBTHolder;
|
||||
import WayofTime.bloodmagic.api.event.RitualEvent;
|
||||
import WayofTime.bloodmagic.api.network.SoulNetwork;
|
||||
import WayofTime.bloodmagic.api.registry.RitualRegistry;
|
||||
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
|
||||
import WayofTime.bloodmagic.api.ritual.LocalRitualStorage;
|
||||
import WayofTime.bloodmagic.api.ritual.Ritual;
|
||||
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
|
||||
import WayofTime.bloodmagic.item.ItemActivationCrystal;
|
||||
import WayofTime.bloodmagic.util.ChatUtil;
|
||||
import com.google.common.base.Strings;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -71,7 +71,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
|
|||
RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, crystalOwner, ritual, activator, activationCrystal, crystalLevel);
|
||||
|
||||
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) {
|
||||
ChatUtil.sendNoSpamUnloc(activator, "chat.AlchemicalWizardry.ritual.prevent");
|
||||
ChatUtil.sendNoSpamUnloc(activator, "chat.BloodMagic.ritual.prevent");
|
||||
return;
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.util;
|
||||
package WayofTime.bloodmagic.util;
|
||||
|
||||
import WayofTime.alchemicalWizardry.network.AlchemicalWizardryPacketHandler;
|
||||
import WayofTime.alchemicalWizardry.util.helper.TextHelper;
|
||||
import WayofTime.bloodmagic.network.AlchemicalWizardryPacketHandler;
|
||||
import WayofTime.bloodmagic.util.helper.TextHelper;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiNewChat;
|
|
@ -1,4 +1,4 @@
|
|||
package WayofTime.alchemicalWizardry.util;
|
||||
package WayofTime.bloodmagic.util;
|
||||
|
||||
public class Utils {
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.util.handler;
|
||||
package WayofTime.bloodmagic.util.handler;
|
||||
|
||||
import WayofTime.alchemicalWizardry.registry.ModBlocks;
|
||||
import WayofTime.alchemicalWizardry.registry.ModItems;
|
||||
import WayofTime.bloodmagic.registry.ModBlocks;
|
||||
import WayofTime.bloodmagic.registry.ModItems;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,6 +1,6 @@
|
|||
package WayofTime.alchemicalWizardry.util.helper;
|
||||
package WayofTime.bloodmagic.util.helper;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.ItemMeshDefinition;
|
||||
|
@ -11,7 +11,6 @@ import net.minecraft.item.Item;
|
|||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
/**
|
||||
* @author <a href="https://github.com/TehNut">TehNut</a>
|
||||
|
@ -103,7 +102,7 @@ public class InventoryRenderHelper {
|
|||
ModelLoader.setCustomMeshDefinition(InventoryRenderHelper.getItemFromBlock(block), new ItemMeshDefinition() {
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack) {
|
||||
return new ModelResourceLocation(AlchemicalWizardry.DOMAIN + toRender.getClass().getSimpleName(), "fluid");
|
||||
return new ModelResourceLocation(BloodMagic.DOMAIN + toRender.getClass().getSimpleName(), "fluid");
|
||||
}
|
||||
});
|
||||
ModelLoader.setCustomStateMapper(block, new StateMapperBase() {
|
|
@ -1,8 +1,7 @@
|
|||
package WayofTime.alchemicalWizardry.util.helper;
|
||||
package WayofTime.bloodmagic.util.helper;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import scala.actors.threadpool.Arrays;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
#Creative Tab
|
||||
itemGroup.AlchemicalWizardry.creativeTab=Blood Magic
|
||||
|
||||
#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.bucket.lifeEssence.name=Bucket of Life
|
||||
|
||||
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
|
||||
|
||||
# Blocks
|
||||
tile.AlchemicalWizardry.fluid.lifeEssence.name=Life Essence
|
||||
tile.AlchemicalWizardry.stone.ritual.master.name=Master Ritual Stone
|
||||
tile.AlchemicalWizardry.stone.ritual.imperfect.name=Imperfect Ritual Stone
|
||||
tile.AlchemicalWizardry.altar.name=Blood Altar
|
||||
|
||||
# Tooltips
|
||||
tooltip.AlchemicalWizardry.orb.desc=Stores raw Life Essence
|
||||
tooltip.AlchemicalWizardry.orb.owner=Added by: %s
|
||||
tooltip.AlchemicalWizardry.currentOwner=Owner: %s
|
||||
tooltip.AlchemicalWizardry.sigil.air.desc=&oI feel lighter already...
|
||||
tooltip.AlchemicalWizardry.sigil.bloodLight.desc=&oI see a light!
|
||||
tooltip.AlchemicalWizardry.sigil.compression.desc=&oHands of Diamonds
|
||||
tooltip.AlchemicalWizardry.sigil.divination.desc=&oPeer into the soul
|
||||
tooltip.AlchemicalWizardry.sigil.divination.currentEssence=Current Essence: %d LP
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "alchemicalwizardry:blocks/MasterRitualStone"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "alchemicalwizardry:blocks/ImperfectRitualStone"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/activationCrystalWeak"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/activationCrystalAwakened"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/activationCrystalWeak"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/WeakBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/ApprenticeBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/ArchmageBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/MagicianBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/MasterBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/TranscendentBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/WeakBloodOrb"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/LifeBucket"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/SacrificialDagger"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/WaterScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/FireScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/EarthScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/AirScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/DuskScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/DawnScribeTool"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/AirSigil"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/BloodLightSigil"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/CompressionSigil_activated"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/CompressionSigil_deactivated"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/DivinationSigil"
|
||||
}
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent":"alchemicalwizardry:item/ItemModelBase",
|
||||
"textures": {
|
||||
"layer0":"alchemicalwizardry:items/BlankSlate"
|
||||
}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue