Initial 1.11.2 update
This commit is contained in:
Electroblob
@@ -37,17 +37,23 @@ import net.minecraftforge.fml.common.registry.GameRegistry.Type;
|
||||
public class Wizardry {
|
||||
|
||||
/** Wizardry's mod ID. */
|
||||
public static final String MODID = "wizardry";
|
||||
// This is going to have to change for 1.12 or it'll conflict with the other wizardry mod.
|
||||
// They were there first, it's only fair... although I wonder if that will have unintended side-effects?
|
||||
public static final String MODID = "wizardry"; // How about 'ebwizardry', to keep it short?
|
||||
/** Wizardry's mod name, in readable form. */
|
||||
public static final String NAME = "Electroblob's Wizardry";
|
||||
/** The version number for this version of wizardry. The following system is used for version numbers:
|
||||
* <p><center><b>[major Minecraft version].[major mod version].[minor mod version/patch]<p></center></b>
|
||||
* The major mod version is consistent across Minecraft versions, i.e. Wizardry 1.1 has the same features as
|
||||
* Wizardry 2.1, but they are for different versions of Minecraft and have separate minor versioning. 1.x.x
|
||||
* represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
|
||||
* 1.11.x versions, and so on. */
|
||||
public static final String VERSION = "2.1.0";
|
||||
|
||||
/**
|
||||
* The version number for this version of wizardry. The following system is used for version numbers:
|
||||
* <p>
|
||||
* <center><b>[major Minecraft version].[major mod version].[minor mod version/patch]
|
||||
* <p>
|
||||
* </center></b> The major mod version is consistent across Minecraft versions, i.e. Wizardry 1.1 has the same
|
||||
* features as Wizardry 2.1, but they are for different versions of Minecraft and have separate minor versioning.
|
||||
* 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
|
||||
* 1.11.x versions, and so on.
|
||||
*/
|
||||
public static final String VERSION = "3.1.0";
|
||||
|
||||
// IDEA: Improve the algorithm that finds a place to summon creatures to take walls into account.
|
||||
// IDEA: Replace all uses of Math.cos and Math.sin with MathHelper versions
|
||||
// IDEA: API feature that automatically injects custom wand upgrades into wizardry's loot tables
|
||||
@@ -55,32 +61,44 @@ public class Wizardry {
|
||||
// IDEA: Dispensers shooting spells from scrolls! Imagine the possibilities!
|
||||
// == Rendering overhaul! ==
|
||||
// IDEA: Make spirit animals fade away when dispelled
|
||||
// IDEA: Use your newfound knowledge of OpenGL to render animated boxes around entities being buffed, similar to creeper charge
|
||||
// IDEA: Use your newfound knowledge of OpenGL to render animated boxes around entities being buffed, similar to
|
||||
// creeper charge
|
||||
// IDEA: Redo RenderArc so it looks like lightning (it's literally a load of translucent boxes inside each other)
|
||||
// IDEA: The arcane workbench could use a few particles
|
||||
// IDEA: Add a box to the wizard armour model so that the robes bend when the wearer is sneaking
|
||||
// IDEA: Flash particle (I think it exists in vanilla somewhere) on spell impact
|
||||
// IDEA: Dust particles spray out from projectiles as they move
|
||||
// IDEA: Colour fading for particles
|
||||
// IDEA: Make lightning and other effects particles. There's no reason why you can't pass in a player argument and have the particles move with them!
|
||||
|
||||
// IDEA: Make lightning and other effects particles. There's no reason why you can't pass in a player argument and
|
||||
// have the particles move with them!
|
||||
|
||||
/* Minor bugs that need fixing at some point:
|
||||
* - Player skin hat layer shows through wizard hats
|
||||
* - Wizard armour breaks rather than just running out of mana (I can't seem to replicate this bug, but I have had
|
||||
* it happen to me before...)
|
||||
* - Player skin hat layer shows through wizard hats - Wizard armour breaks rather than just running out of mana (I
|
||||
* can't seem to replicate this bug, but I have had it happen to me before...)
|
||||
* - Shift-clicking a stack of special upgrades when in the arcane workbench causes the whole stack to be
|
||||
* transferred when it should be just one (this is a bug with vanilla as well - try putting a stack of bottles into
|
||||
* a brewing stand). I have at least made it so only one gets used now, so it has no impact on the game.
|
||||
* transferred when it should be just one (this is a bug with vanilla as well - try putting a stack of bottles into
|
||||
* a brewing stand). I have at least made it so only one gets used now, so it has no impact on the game.
|
||||
* - When a spell is on cooldown, you can't break blocks when holding a wand. */
|
||||
|
||||
|
||||
// TODO: So somehow I have managed to overlook the fact that health is actually a float. What this means is that
|
||||
// I can make the healing spells use damage multipliers - hurrah!
|
||||
|
||||
// TODO: Switch from IInventory to IItemHandler (Or don't. It's only useful for automation really.)
|
||||
// TODO: Triggering of inbuilt Forge events in relevant places?
|
||||
// TODO: Implement custom events
|
||||
// TODO: Rearrange the config gui and file
|
||||
|
||||
|
||||
// Updating:
|
||||
// TODO: Make sure all obf reflection names are still correct
|
||||
// ItemStacks can no longer be null, only empty, so:
|
||||
// TODO: Replace all instances of stack = null with stack = ItemStack.EMPTY
|
||||
// TODO: For each check, either replace with stack.isEmpty or simply remove it, depending on the use
|
||||
// TODO: Go through each of the summoned creatures and check there are no extra vanilla methods to override
|
||||
// TODO: Check whether Minecraft has added some methods that do the same job as my utilities, particularly in
|
||||
// relation to itemstacks, hotbar, armour slots and inventory slots.
|
||||
// TODO: Add wizard towers to the /locate command
|
||||
// TODO: Fix cascading worldgen lag and backport (offset area into loaded chunks, possibly use WorldGenMinable)
|
||||
// TODO: Change evil wizard sounds again to use illager sounds?
|
||||
|
||||
// TODO: Have particles obey Minecraft's particle setting where appropriate
|
||||
// (see https://github.com/RootsTeam/Embers/blob/master/src/main/java/teamroots/embers/particle/ParticleUtil.java)
|
||||
|
||||
@@ -88,12 +106,12 @@ public class Wizardry {
|
||||
|
||||
/** Static instance of the {@link Settings} object for Wizardry. */
|
||||
public static final Settings settings = new Settings();
|
||||
|
||||
|
||||
/** Static instance of the {@link Logger} object for Wizardry. */
|
||||
public static Logger logger;
|
||||
|
||||
//private static Pattern entityNamePattern;
|
||||
|
||||
|
||||
// private static Pattern entityNamePattern;
|
||||
|
||||
// EventManager
|
||||
WizardryWorldGenerator generator = new WizardryWorldGenerator();
|
||||
|
||||
@@ -102,19 +120,19 @@ public class Wizardry {
|
||||
public static Wizardry instance;
|
||||
|
||||
// Location of the proxy code, used by Forge.
|
||||
@SidedProxy(clientSide="electroblob.wizardry.client.ClientProxy", serverSide="electroblob.wizardry.CommonProxy")
|
||||
@SidedProxy(clientSide = "electroblob.wizardry.client.ClientProxy", serverSide = "electroblob.wizardry.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event){
|
||||
|
||||
|
||||
logger = event.getModLog();
|
||||
|
||||
|
||||
// The array in question no longer exists, so I'm pretty sure this isn't necessary any more.
|
||||
// expandPotionTypesArray();
|
||||
|
||||
settings.initConfig(event);
|
||||
|
||||
|
||||
// Yes - by the looks of it, having an interface is completely unnecessary in this case.
|
||||
CapabilityManager.INSTANCE.register(WizardData.class, new IStorage<WizardData>(){
|
||||
// These methods are only called by Capability.writeNBT() or Capability.readNBT(), which in turn are
|
||||
@@ -122,8 +140,14 @@ public class Wizardry {
|
||||
// to allow capabilities to be saved and loaded manually. What that would be useful for I don't know.
|
||||
// (If an API forces most users to write redundant code for no reason, it's not user friendly, is it?)
|
||||
// ... well, that's my rant for today!
|
||||
@Override public NBTBase writeNBT(Capability<WizardData> capability, WizardData instance, EnumFacing side){ return null; }
|
||||
@Override public void readNBT(Capability<WizardData> capability, WizardData instance, EnumFacing side, NBTBase nbt){}
|
||||
@Override
|
||||
public NBTBase writeNBT(Capability<WizardData> capability, WizardData instance, EnumFacing side){
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readNBT(Capability<WizardData> capability, WizardData instance, EnumFacing side, NBTBase nbt){
|
||||
}
|
||||
}, WizardData.class);
|
||||
|
||||
WizardryRegistry.registerTileEntities();
|
||||
@@ -131,10 +155,10 @@ public class Wizardry {
|
||||
WizardryRegistry.registerEntities(this);
|
||||
// The check for the generateLoot setting is now done within this method.
|
||||
WizardryRegistry.registerLoot();
|
||||
|
||||
|
||||
// NOTE: Will need to be moved to init for 1.12, as will anything that needs to be after the registry events.
|
||||
WizardryTabs.sort();
|
||||
|
||||
|
||||
// Moved to preInit, because apparently it has to be here now.
|
||||
proxy.registerRenderers();
|
||||
|
||||
@@ -160,7 +184,7 @@ public class Wizardry {
|
||||
|
||||
// Recipes
|
||||
WizardryRegistry.registerRecipes();
|
||||
|
||||
|
||||
proxy.initMixedFontRenderer();
|
||||
}
|
||||
|
||||
@@ -168,27 +192,20 @@ public class Wizardry {
|
||||
public void postInit(FMLPostInitializationEvent event){
|
||||
// This needs to be here or it won't necessarily include all the mods' entities.
|
||||
// TODO: Re-implement this when the Forge bug is fixed.
|
||||
/* Doesn't seem to be doing anything...
|
||||
String entityNames = "";
|
||||
for(Object name : EntityList.classToStringMapping.values()){
|
||||
if(name instanceof String){
|
||||
entityNames = entityNames + name + '|';
|
||||
}
|
||||
}
|
||||
// Cuts off the last '|'
|
||||
entityNames = entityNames.substring(0, entityNames.length()-1);
|
||||
entityNamePattern = Pattern.compile(entityNames);
|
||||
*/
|
||||
/* Doesn't seem to be doing anything... String entityNames = ""; for(Object name :
|
||||
* EntityList.classToStringMapping.values()){ if(name instanceof String){ entityNames = entityNames + name +
|
||||
* '|'; } } // Cuts off the last '|' entityNames = entityNames.substring(0, entityNames.length()-1);
|
||||
* entityNamePattern = Pattern.compile(entityNames); */
|
||||
proxy.initialiseLayers();
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void serverStarting(FMLServerStartingEvent event){
|
||||
event.registerServerCommand(new CommandCastSpell());
|
||||
event.registerServerCommand(new CommandSetAlly());
|
||||
event.registerServerCommand(new CommandViewAllies());
|
||||
event.registerServerCommand(new CommandDiscoverSpell());
|
||||
}
|
||||
public void serverStarting(FMLServerStartingEvent event){
|
||||
event.registerServerCommand(new CommandCastSpell());
|
||||
event.registerServerCommand(new CommandSetAlly());
|
||||
event.registerServerCommand(new CommandViewAllies());
|
||||
event.registerServerCommand(new CommandDiscoverSpell());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onConfigChanged(net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent event){
|
||||
@@ -206,58 +223,139 @@ public class Wizardry {
|
||||
// Just get, not getAll, since the mod id didn't change!
|
||||
for(FMLMissingMappingsEvent.MissingMapping mapping : event.get()){
|
||||
if(mapping.type == Type.ITEM && mapping.resourceLocation.getResourceDomain().equals(Wizardry.MODID)){
|
||||
|
||||
|
||||
Item replacement = null;
|
||||
|
||||
|
||||
switch(mapping.resourceLocation.getResourcePath()){
|
||||
|
||||
case "wand_basic": replacement = WizardryItems.magic_wand; break;
|
||||
case "wand_basic_fire": replacement = WizardryItems.basic_fire_wand; break;
|
||||
case "wand_basic_ice": replacement = WizardryItems.basic_ice_wand; break;
|
||||
case "wand_basic_lightning": replacement = WizardryItems.basic_lightning_wand; break;
|
||||
case "wand_basic_necromancy": replacement = WizardryItems.basic_necromancy_wand; break;
|
||||
case "wand_basic_earth": replacement = WizardryItems.basic_earth_wand; break;
|
||||
case "wand_basic_sorcery": replacement = WizardryItems.basic_sorcery_wand; break;
|
||||
case "wand_basic_healing": replacement = WizardryItems.basic_healing_wand; break;
|
||||
case "wand_apprentice": replacement = WizardryItems.apprentice_wand; break;
|
||||
case "wand_apprentice_fire": replacement = WizardryItems.apprentice_fire_wand; break;
|
||||
case "wand_apprentice_ice": replacement = WizardryItems.apprentice_ice_wand; break;
|
||||
case "wand_apprentice_lightning": replacement = WizardryItems.apprentice_lightning_wand; break;
|
||||
case "wand_apprentice_necromancy": replacement = WizardryItems.apprentice_necromancy_wand; break;
|
||||
case "wand_apprentice_earth": replacement = WizardryItems.apprentice_earth_wand; break;
|
||||
case "wand_apprentice_sorcery": replacement = WizardryItems.apprentice_sorcery_wand; break;
|
||||
case "wand_apprentice_healing": replacement = WizardryItems.apprentice_healing_wand; break;
|
||||
case "wand_advanced": replacement = WizardryItems.advanced_wand; break;
|
||||
case "wand_advanced_fire": replacement = WizardryItems.advanced_fire_wand; break;
|
||||
case "wand_advanced_ice": replacement = WizardryItems.advanced_ice_wand; break;
|
||||
case "wand_advanced_lightning": replacement = WizardryItems.advanced_lightning_wand; break;
|
||||
case "wand_advanced_necromancy": replacement = WizardryItems.advanced_necromancy_wand; break;
|
||||
case "wand_advanced_earth": replacement = WizardryItems.advanced_earth_wand; break;
|
||||
case "wand_advanced_sorcery": replacement = WizardryItems.advanced_sorcery_wand; break;
|
||||
case "wand_advanced_healing": replacement = WizardryItems.advanced_healing_wand; break;
|
||||
case "wand_master": replacement = WizardryItems.master_wand; break;
|
||||
case "wand_master_fire": replacement = WizardryItems.master_fire_wand; break;
|
||||
case "wand_master_ice": replacement = WizardryItems.master_ice_wand; break;
|
||||
case "wand_master_lightning": replacement = WizardryItems.master_lightning_wand; break;
|
||||
case "wand_master_necromancy": replacement = WizardryItems.master_necromancy_wand; break;
|
||||
case "wand_master_earth": replacement = WizardryItems.master_earth_wand; break;
|
||||
case "wand_master_sorcery": replacement = WizardryItems.master_sorcery_wand; break;
|
||||
case "wand_master_healing": replacement = WizardryItems.master_healing_wand; break;
|
||||
case "upgrade_storage": replacement = WizardryItems.storage_upgrade; break;
|
||||
case "upgrade_siphon": replacement = WizardryItems.siphon_upgrade; break;
|
||||
case "upgrade_condenser": replacement = WizardryItems.condenser_upgrade; break;
|
||||
case "upgrade_range": replacement = WizardryItems.range_upgrade; break;
|
||||
case "upgrade_duration": replacement = WizardryItems.duration_upgrade; break;
|
||||
case "upgrade_cooldown": replacement = WizardryItems.cooldown_upgrade; break;
|
||||
case "upgrade_blast": replacement = WizardryItems.blast_upgrade; break;
|
||||
case "upgrade_attunement": replacement = WizardryItems.attunement_upgrade; break;
|
||||
|
||||
case "wand_basic":
|
||||
replacement = WizardryItems.magic_wand;
|
||||
break;
|
||||
case "wand_basic_fire":
|
||||
replacement = WizardryItems.basic_fire_wand;
|
||||
break;
|
||||
case "wand_basic_ice":
|
||||
replacement = WizardryItems.basic_ice_wand;
|
||||
break;
|
||||
case "wand_basic_lightning":
|
||||
replacement = WizardryItems.basic_lightning_wand;
|
||||
break;
|
||||
case "wand_basic_necromancy":
|
||||
replacement = WizardryItems.basic_necromancy_wand;
|
||||
break;
|
||||
case "wand_basic_earth":
|
||||
replacement = WizardryItems.basic_earth_wand;
|
||||
break;
|
||||
case "wand_basic_sorcery":
|
||||
replacement = WizardryItems.basic_sorcery_wand;
|
||||
break;
|
||||
case "wand_basic_healing":
|
||||
replacement = WizardryItems.basic_healing_wand;
|
||||
break;
|
||||
case "wand_apprentice":
|
||||
replacement = WizardryItems.apprentice_wand;
|
||||
break;
|
||||
case "wand_apprentice_fire":
|
||||
replacement = WizardryItems.apprentice_fire_wand;
|
||||
break;
|
||||
case "wand_apprentice_ice":
|
||||
replacement = WizardryItems.apprentice_ice_wand;
|
||||
break;
|
||||
case "wand_apprentice_lightning":
|
||||
replacement = WizardryItems.apprentice_lightning_wand;
|
||||
break;
|
||||
case "wand_apprentice_necromancy":
|
||||
replacement = WizardryItems.apprentice_necromancy_wand;
|
||||
break;
|
||||
case "wand_apprentice_earth":
|
||||
replacement = WizardryItems.apprentice_earth_wand;
|
||||
break;
|
||||
case "wand_apprentice_sorcery":
|
||||
replacement = WizardryItems.apprentice_sorcery_wand;
|
||||
break;
|
||||
case "wand_apprentice_healing":
|
||||
replacement = WizardryItems.apprentice_healing_wand;
|
||||
break;
|
||||
case "wand_advanced":
|
||||
replacement = WizardryItems.advanced_wand;
|
||||
break;
|
||||
case "wand_advanced_fire":
|
||||
replacement = WizardryItems.advanced_fire_wand;
|
||||
break;
|
||||
case "wand_advanced_ice":
|
||||
replacement = WizardryItems.advanced_ice_wand;
|
||||
break;
|
||||
case "wand_advanced_lightning":
|
||||
replacement = WizardryItems.advanced_lightning_wand;
|
||||
break;
|
||||
case "wand_advanced_necromancy":
|
||||
replacement = WizardryItems.advanced_necromancy_wand;
|
||||
break;
|
||||
case "wand_advanced_earth":
|
||||
replacement = WizardryItems.advanced_earth_wand;
|
||||
break;
|
||||
case "wand_advanced_sorcery":
|
||||
replacement = WizardryItems.advanced_sorcery_wand;
|
||||
break;
|
||||
case "wand_advanced_healing":
|
||||
replacement = WizardryItems.advanced_healing_wand;
|
||||
break;
|
||||
case "wand_master":
|
||||
replacement = WizardryItems.master_wand;
|
||||
break;
|
||||
case "wand_master_fire":
|
||||
replacement = WizardryItems.master_fire_wand;
|
||||
break;
|
||||
case "wand_master_ice":
|
||||
replacement = WizardryItems.master_ice_wand;
|
||||
break;
|
||||
case "wand_master_lightning":
|
||||
replacement = WizardryItems.master_lightning_wand;
|
||||
break;
|
||||
case "wand_master_necromancy":
|
||||
replacement = WizardryItems.master_necromancy_wand;
|
||||
break;
|
||||
case "wand_master_earth":
|
||||
replacement = WizardryItems.master_earth_wand;
|
||||
break;
|
||||
case "wand_master_sorcery":
|
||||
replacement = WizardryItems.master_sorcery_wand;
|
||||
break;
|
||||
case "wand_master_healing":
|
||||
replacement = WizardryItems.master_healing_wand;
|
||||
break;
|
||||
case "upgrade_storage":
|
||||
replacement = WizardryItems.storage_upgrade;
|
||||
break;
|
||||
case "upgrade_siphon":
|
||||
replacement = WizardryItems.siphon_upgrade;
|
||||
break;
|
||||
case "upgrade_condenser":
|
||||
replacement = WizardryItems.condenser_upgrade;
|
||||
break;
|
||||
case "upgrade_range":
|
||||
replacement = WizardryItems.range_upgrade;
|
||||
break;
|
||||
case "upgrade_duration":
|
||||
replacement = WizardryItems.duration_upgrade;
|
||||
break;
|
||||
case "upgrade_cooldown":
|
||||
replacement = WizardryItems.cooldown_upgrade;
|
||||
break;
|
||||
case "upgrade_blast":
|
||||
replacement = WizardryItems.blast_upgrade;
|
||||
break;
|
||||
case "upgrade_attunement":
|
||||
replacement = WizardryItems.attunement_upgrade;
|
||||
break;
|
||||
// If it didn't match any of the ones that changed, do nothing.
|
||||
default: return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
// No need to log, Forge does that.
|
||||
mapping.remap(replacement);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user