parent
3328c4db74
commit
c607817bcd
|
@ -11,8 +11,7 @@ import java.util.List;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipInputStream;
|
||||||
|
|
||||||
import WayofTime.alchemicalWizardry.common.thread.CommandDown
|
import WayofTime.alchemicalWizardry.common.thread.CommandDownloadGAPI;
|
||||||
loadGAPI;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
|
@ -387,6 +386,8 @@ public class AlchemicalWizardry
|
||||||
public static boolean ritualDisabledPhantomHands;
|
public static boolean ritualDisabledPhantomHands;
|
||||||
public static boolean ritualDisabledSphereIsland;
|
public static boolean ritualDisabledSphereIsland;
|
||||||
|
|
||||||
|
public static boolean displayRitualAnimation;
|
||||||
|
|
||||||
public static boolean potionDisableRegen;
|
public static boolean potionDisableRegen;
|
||||||
public static boolean potionDisableNightVision;
|
public static boolean potionDisableNightVision;
|
||||||
public static boolean potionDisableFireResistance;
|
public static boolean potionDisableFireResistance;
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class BloodMagicConfiguration
|
||||||
AlchemicalWizardry.ritualDisabledCrafting = config.get("Ritual Blacklist", "Rhythm of the Beating Anvil", false).getBoolean(false);
|
AlchemicalWizardry.ritualDisabledCrafting = config.get("Ritual Blacklist", "Rhythm of the Beating Anvil", false).getBoolean(false);
|
||||||
AlchemicalWizardry.ritualDisabledPhantomHands = config.get("Ritual Blacklist", "Orchestra of the Phantom Hands", false).getBoolean(false);
|
AlchemicalWizardry.ritualDisabledPhantomHands = config.get("Ritual Blacklist", "Orchestra of the Phantom Hands", false).getBoolean(false);
|
||||||
AlchemicalWizardry.ritualDisabledSphereIsland = config.get("Ritual Blacklist", "Birth of the Bastion", false).getBoolean(false);
|
AlchemicalWizardry.ritualDisabledSphereIsland = config.get("Ritual Blacklist", "Birth of the Bastion", false).getBoolean(false);
|
||||||
|
|
||||||
AlchemicalWizardry.potionDisableRegen = config.get("Alchemy Potion Blacklist", "Regeneration", false).getBoolean(false);
|
AlchemicalWizardry.potionDisableRegen = config.get("Alchemy Potion Blacklist", "Regeneration", false).getBoolean(false);
|
||||||
AlchemicalWizardry.potionDisableNightVision = config.get("Alchemy Potion Blacklist", "Night Vision", false).getBoolean(false);
|
AlchemicalWizardry.potionDisableNightVision = config.get("Alchemy Potion Blacklist", "Night Vision", false).getBoolean(false);
|
||||||
AlchemicalWizardry.potionDisableFireResistance = config.get("Alchemy Potion Blacklist", "Fire Resistance", false).getBoolean(false);
|
AlchemicalWizardry.potionDisableFireResistance = config.get("Alchemy Potion Blacklist", "Fire Resistance", false).getBoolean(false);
|
||||||
|
@ -208,6 +208,7 @@ public class BloodMagicConfiguration
|
||||||
RenderHelper.yOffset = config.get("ClientSettings", "AlchemyHUDyOffset", 2).getInt();
|
RenderHelper.yOffset = config.get("ClientSettings", "AlchemyHUDyOffset", 2).getInt();
|
||||||
RenderHelper.lpBarX = config.get("ClientSettings", "LPHUDxOffset", 12).getInt();
|
RenderHelper.lpBarX = config.get("ClientSettings", "LPHUDxOffset", 12).getInt();
|
||||||
RenderHelper.lpBarY = config.get("ClientSettings", "LPHUDyOffset", 75).getInt();
|
RenderHelper.lpBarY = config.get("ClientSettings", "LPHUDyOffset", 75).getInt();
|
||||||
|
AlchemicalWizardry.displayRitualAnimation = config.get("ClientSettings", "Display Ritual Animation", true).getBoolean(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
config.save();
|
config.save();
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package WayofTime.alchemicalWizardry.client;
|
package WayofTime.alchemicalWizardry.client;
|
||||||
|
|
||||||
|
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||||
import WayofTime.alchemicalWizardry.common.thread.GAPIChecker;
|
import WayofTime.alchemicalWizardry.common.thread.GAPIChecker;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
@ -159,7 +160,10 @@ public class ClientProxy extends CommonProxy
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TESpellParadigmBlock.class, new RenderSpellParadigmBlock());
|
ClientRegistry.bindTileEntitySpecialRenderer(TESpellParadigmBlock.class, new RenderSpellParadigmBlock());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TESpellModifierBlock.class, new RenderSpellModifierBlock());
|
ClientRegistry.bindTileEntitySpecialRenderer(TESpellModifierBlock.class, new RenderSpellModifierBlock());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TEReagentConduit.class, new RenderReagentConduit());
|
ClientRegistry.bindTileEntitySpecialRenderer(TEReagentConduit.class, new RenderReagentConduit());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TEMasterStone.class, new RenderMasterStone());
|
if (AlchemicalWizardry.displayRitualAnimation)
|
||||||
|
{
|
||||||
|
ClientRegistry.bindTileEntitySpecialRenderer(TEMasterStone.class, new RenderMasterStone());
|
||||||
|
}
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TEAlchemicCalcinator.class, new RenderAlchemicCalcinator());
|
ClientRegistry.bindTileEntitySpecialRenderer(TEAlchemicCalcinator.class, new RenderAlchemicCalcinator());
|
||||||
ClientRegistry.bindTileEntitySpecialRenderer(TEBellJar.class, new RenderCrystalBelljar());
|
ClientRegistry.bindTileEntitySpecialRenderer(TEBellJar.class, new RenderCrystalBelljar());
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class BloodMagicGuide
|
||||||
registerAlchemyBook();
|
registerAlchemyBook();
|
||||||
|
|
||||||
BookBuilder bmBookBuilder = new BookBuilder();
|
BookBuilder bmBookBuilder = new BookBuilder();
|
||||||
bmBookBuilder.setCategories(categories).setUnlocBookTitle("guide.BloodMagic.book.title").setUnlocWelcomeMessage("guide.BloodMagic.welcomeMessage").setUnlocDisplayName("guide.BloodMagic.book.name").setBookColor(new Color(190, 10, 0)).setAuthor("--Blood Magic");
|
bmBookBuilder.setCategories(categories).setUnlocBookTitle("guide.BloodMagic.book.title").setUnlocWelcomeMessage("guide.BloodMagic.welcomeMessage").setUnlocDisplayName("guide.BloodMagic.book.name").setBookColor(new Color(190, 10, 0)).setAuthor("-Blood Magic");
|
||||||
|
|
||||||
// bloodMagicGuide = new Book(categories, "guide.BloodMagic.book.title", "guide.BloodMagic.welcomeMessage", "guide.BloodMagic.book.name", new Color(190, 10, 0));
|
// bloodMagicGuide = new Book(categories, "guide.BloodMagic.book.title", "guide.BloodMagic.welcomeMessage", "guide.BloodMagic.book.name", new Color(190, 10, 0));
|
||||||
bloodMagicGuide = bmBookBuilder.build();
|
bloodMagicGuide = bmBookBuilder.build();
|
||||||
|
|
|
@ -252,7 +252,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig
|
||||||
}
|
}
|
||||||
|
|
||||||
int range = 2;
|
int range = 2;
|
||||||
int verticalOffset = -1;
|
int verticalOffset = -2;
|
||||||
|
|
||||||
if (player.isSneaking())
|
if (player.isSneaking())
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,9 +35,9 @@ public class TESpectralBlock extends TileEntity
|
||||||
{
|
{
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
|
|
||||||
if (worldObj.isRemote)
|
// if (worldObj.isRemote)
|
||||||
{
|
{
|
||||||
return;
|
// return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.ticksRemaining--;
|
this.ticksRemaining--;
|
||||||
|
|
Loading…
Reference in a new issue