Skip to content

Commit

Permalink
Merge pull request #14 from GTNewHorizons/yeet_dev_capes
Browse files Browse the repository at this point in the history 
remove dev capes they aren't found in the full pack anyways
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 13, 2022
2 parents 924a61e + 34d2a90 commit 6ca92e2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 56 deletions.
21 changes: 0 additions & 21 deletions src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
*/
package shedar.mods.ic2.nuclearcontrol;

import com.jadarstudios.developercapes.DevCapes;

import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
Expand All @@ -22,10 +18,6 @@
import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityIC2ThermoRenderer;
import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityInfoPanelRenderer;
import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityRemoteThermoRenderer;
import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;

import java.net.MalformedURLException;
import java.net.URL;

public class ClientProxy extends CommonProxy {

Expand Down Expand Up @@ -66,17 +58,4 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int
public static EntityPlayer getPlayer() {
return Minecraft.getMinecraft().thePlayer;
}

public void cape(){
try {
Class.forName("com.jadarstudios.developercapes.DevCapes");
registerSupporterCapes();
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}

private void registerSupporterCapes() {
DevCapes.getInstance().registerConfig("https://raw.githubusercontent.com/xbony2/xbony2.github.io/master/cape.json");
}
}
1 change: 0 additions & 1 deletion src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ private void loadConfiguration() {
IC2NuclearControl.instance.dataRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "sensorDataRefreshPeriod", 4, "can not be longer than infoPanelRefreshPeriod [default: 4]").getInt();
IC2NuclearControl.instance.rangeTriggerRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "rangeTriggerRefreshPeriod", 20).getInt();
IC2NuclearControl.instance.SMPMaxAlarmRange = configuration.get(Configuration.CATEGORY_GENERAL, "SMPMaxAlarmRange", 256).getInt();
IC2NuclearControl.instance.disableCapes = configuration.get(Configuration.CATEGORY_GENERAL, "disableCapes", false).getBoolean(false);
//IC2NuclearControl.isHttpSensorAvailableClient = configuration.getBoolean("isHttpSensorAvailableClient", Configuration.CATEGORY_GENERAL, false, "Turns on/off the recipes for the web upgrade client side");
//IC2NuclearControl.isHttpSensorAvailableServer = configuration.getBoolean("isHttpSensorAvailableServer", Configuration.CATEGORY_GENERAL, true, "Turns on/off the recipes for the web upgrade server side");
//IC2NuclearControl.instance.httpSensorKey = configuration.get(Configuration.CATEGORY_GENERAL, "httpSensorKey", UUID.randomUUID().toString().replace("-", "")).getString();
Expand Down
39 changes: 5 additions & 34 deletions src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,12 @@
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import java.io.File;
import java.util.List;

import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;

import org.apache.logging.log4j.Logger;

import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlLight;
import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain;
import shedar.mods.ic2.nuclearcontrol.crossmod.CrossModLoader;
import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossBuildcraft;
import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossRF;
import shedar.mods.ic2.nuclearcontrol.crossmod.gregtech.CrossGregTech;
Expand All @@ -32,29 +26,15 @@
import shedar.mods.ic2.nuclearcontrol.crossmod.ic2.IC2Type;
import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.CrossOpenComputers;
import shedar.mods.ic2.nuclearcontrol.crossmod.railcraft.CrossRailcraft;
import shedar.mods.ic2.nuclearcontrol.items.ItemCard55Reactor;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergyArrayLocation;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardLiquidArrayLocation;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardMultipleSensorLocation;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardReactorSensorLocation;
import shedar.mods.ic2.nuclearcontrol.items.ItemCardText;
import shedar.mods.ic2.nuclearcontrol.items.ItemKitEnergySensor;
import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor;
import shedar.mods.ic2.nuclearcontrol.items.ItemKitReactorSensor;
import shedar.mods.ic2.nuclearcontrol.items.ItemNuclearControlLight;
import shedar.mods.ic2.nuclearcontrol.items.ItemNuclearControlMain;
import shedar.mods.ic2.nuclearcontrol.items.ItemPanelMemoryCard;
import shedar.mods.ic2.nuclearcontrol.items.ItemRemoteMonitor;
import shedar.mods.ic2.nuclearcontrol.items.ItemTimeCard;
import shedar.mods.ic2.nuclearcontrol.items.ItemToolDigitalThermometer;
import shedar.mods.ic2.nuclearcontrol.items.ItemToolThermometer;
import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade;
import shedar.mods.ic2.nuclearcontrol.items.*;
import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler;
import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager;
import shedar.mods.ic2.nuclearcontrol.recipes.RecipesNew;
import shedar.mods.ic2.nuclearcontrol.recipes.RecipesOld;

import java.io.File;
import java.util.List;



@Mod(modid = "IC2NuclearControl", name = "Nuclear Control 2", version = "GRADLETOKEN_VERSION", dependencies = "required-after:IC2; after:gregtech;", guiFactory = "shedar.mods.ic2.nuclearcontrol.gui.GuiFactory")
Expand Down Expand Up @@ -115,7 +95,6 @@ public class IC2NuclearControl {
public int screenRefreshPeriod;
public int dataRefreshPeriod;
public int rangeTriggerRefreshPeriod;
public boolean disableCapes;
public String recipes;

public CrossBuildcraft crossBC;
Expand Down Expand Up @@ -171,10 +150,7 @@ protected void registerBlocks() {
public void preInit(FMLPreInitializationEvent event) {
isThorfusionLoaded = Loader.isModLoaded("thorfusion");
logger = event.getModLog();
if (event.getSide() == Side.CLIENT)
isServer = false;
else
isServer = true;
isServer = event.getSide() != Side.CLIENT;

// Loads configuration
config = new ConfigurationHandler();
Expand Down Expand Up @@ -212,11 +188,6 @@ public void init(FMLInitializationEvent event) {
@EventHandler
public void postInit(FMLPostInitializationEvent event) {
//proxy, tilentity
if (!isThorfusionLoaded) {
if (!disableCapes) {
proxy.cape();
}
}
CrossModLoader.postinit();
crossBC = new CrossBuildcraft();
crossRailcraft = new CrossRailcraft();
Expand Down

0 comments on commit 6ca92e2

Please sign in to comment.