lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move config to annotation system

Browse source 
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
This commit is contained in:
Nicholas Ignoffo 2017-08-19 18:56:50 -07:00 • committed by Nicholas Ignoffo
parent a10b2ece9a
commit d99cf77288
45 changed files with 320 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java
View file

@ -1,37 +0,0 @@
package WayofTime.bloodmagic.client.gui.config;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ConfigHandler;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.fml.client.config.GuiConfig;
import net.minecraftforge.fml.client.config.IConfigElement;
import java.util.ArrayList;
import java.util.List;
public class ConfigGui extends GuiConfig {
public ConfigGui(GuiScreen parentScreen) {
super(parentScreen, getConfigElements(parentScreen), BloodMagic.MODID, false, false, "BloodMagic Configuration");
}
@SuppressWarnings("rawtypes")
private static List<IConfigElement> getConfigElements(GuiScreen parent) {
List<IConfigElement> list = new ArrayList<IConfigElement>();
// adds sections declared in ConfigHandler. toLowerCase() is used
// because the configuration class automatically does this, so must we.
list.add(new ConfigElement(ConfigHandler.config.getCategory("Potions".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Client".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Compatibility".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Teleposer Blacklist".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Well of Suffering Blacklist".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Item/Block Blacklisting".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("General".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Rituals".toLowerCase())));
list.add(new ConfigElement(ConfigHandler.config.getCategory("Blood Altar Sacrificial Values".toLowerCase())));
return list;
}
}

29
src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.client.gui.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.client.IModGuiFactory;
import java.util.Set;
public class ConfigGuiFactory implements IModGuiFactory {
@Override
public void initialize(Minecraft minecraftInstance) {
}
@Override
public boolean hasConfigGui() {
return false;
}
@Override
public GuiScreen createConfigGui(GuiScreen parentScreen) {
return new ConfigGui(parentScreen);
}
@Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
return null;
}
}

2
src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
View file

@ -24,7 +24,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
@Override
public void render(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
if (mc.player.getHeldItemMainhand().getItem() instanceof INodeRenderer || ConfigHandler.alwaysRenderRoutingLines) {
if (mc.player.getHeldItemMainhand().getItem() instanceof INodeRenderer || ConfigHandler.client.alwaysRenderRoutingLines) {
List<BlockPos> connectionList = tileNode.getConnected();
for (BlockPos wantedPos : connectionList) {
BlockPos offsetPos = wantedPos.subtract(tileNode.getPos());