Permalink
Browse files

Removed even more outdated config settings and all their references

  • Loading branch information...
HenryLoenwind committed Jan 1, 2017
1 parent 17733bd commit 505cbcf0b0bfa824c5f4d21addfd17c9b5255cb9
@@ -90,7 +90,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Coordinate Selector" required="true">
<config section="Item Enabling" name="travelAnchorEnabled" value="true" />
<crafting>
<grid size="3x3">
<item name="ELECTRICAL_STEEL" /><item name="enderpearl" /><item name="ELECTRICAL_STEEL" />
@@ -262,7 +261,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Dark Bow" required="true">
<config name="darkSteelBowEnabled" section="Item Enabling" value="true"/>
<crafting>
<grid size="3x3">
<item /><item name="NUTRITIOUS_STICK" /><item name="string"/>
@@ -544,32 +542,6 @@ XML editor will display that as tooltips when editing this file.
</crafting>
</recipe>
<alias name="GAS_CONDUIT" item="minecraft:stone:0">
<!-- prevent log messages from the output tags using this -->
<dependency item="enderio:itemGasConduit:0" reverse="true"/>
</alias>
<recipe name="Conduit, Gas" required="true">
<config name="gasConduitEnabled" section="Item Enabling" value="true"/>
<dependency item="enderio:itemGasConduit:0" />
<crafting>
<grid>
<item name="CONDUIT_BINDER" /><item name="CONDUIT_BINDER" /><item name="CONDUIT_BINDER" />
<item name="ELECTRICAL_STEEL" /><item name="FUSED_QUARTZ" /><item name="ELECTRICAL_STEEL" />
<item name="CONDUIT_BINDER" /><item name="CONDUIT_BINDER" /><item name="CONDUIT_BINDER" />
</grid>
<output name="GAS_CONDUIT" amount="12">
<level maxlevel="1"/>
</output>
<output name="GAS_CONDUIT" amount="8">
<level minlevel="2" maxlevel="2"/>
</output>
<output name="GAS_CONDUIT" amount="2">
<level minlevel="3"/>
</output>
</crafting>
</recipe>
<alias name="OC_CONDUIT" item="enderio:itemOCConduit:0">
<dependency item="enderio:itemOCConduit:0" reverse="false"/>
</alias>
@@ -807,7 +779,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Advanced Inventory Panel Remote" required="true">
<config section="Item Enabling" name="transceiverEnabled" value="true" />
<crafting>
<grid size="3x3">
<item/><item/><item name="PPP_DARK_STEEL" />
@@ -819,7 +790,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Ender Inventory Panel Remote" required="true">
<config section="Item Enabling" name="transceiverEnabled" value="true" />
<crafting>
<grid size="3x3">
<item/><item/><item name="PPP_SOULARIUM" />
@@ -109,7 +109,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Reservoir" required="true">
<config section="Item Enabling" name="reservoirEnabled" value="true" />
<crafting>
<level maxlevel="1" />
<grid size="3x3">
@@ -271,7 +270,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Transceiver" required="true">
<config section="Item Enabling" name="transceiverEnabled" value="true" />
<crafting>
<level maxlevel="1" />
<grid size="3x3">
@@ -743,7 +741,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Travel Anchor" required="true">
<config section="Item Enabling" name="travelAnchorEnabled" value="true" />
<crafting>
<grid size="3x3">
<item name="ingotIron" /><item name="CONDUIT_BINDER" /><item name="ingotIron" />
@@ -405,7 +405,6 @@ XML editor will display that as tooltips when editing this file.
</recipe>
<recipe name="Reinforced Obsidian" required="true">
<config name="reinforcedObsidianEnabled" section="Item Enabling" value="true"/>
<crafting>
<level maxlevel="2"/>
<grid>
@@ -9,7 +9,6 @@
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.TileEntityEio;
import crazypants.enderio.config.Config;
import crazypants.enderio.integration.waila.IWailaInfoProvider;
import crazypants.enderio.render.IHaveRenderers;
import crazypants.util.ClientUtil;
@@ -46,12 +45,7 @@ private BlockReinforcedObsidian() {
setHardness(50.0F);
setResistance(2000.0F);
setSoundType(SoundType.STONE);
if (!Config.reinforcedObsidianEnabled) {
setCreativeTab(null);
} else {
setCreativeTab(EnderIOTab.tabEnderIO);
}
setCreativeTab(EnderIOTab.tabEnderIO);
}
@Override
@@ -101,15 +101,8 @@ public String lc() {
public static boolean jeiUseShortenedPainterRecipes = true;
public static boolean reinforcedObsidianEnabled = true;
public static boolean photovoltaicCellEnabled = true;
public static boolean reservoirEnabled = true;
public static double conduitScale = DEFAULT_CONDUIT_SCALE;
public static boolean transceiverEnabled = true;
public static double transceiverEnergyLoss = 0.1;
public static int transceiverBucketTransmissionCostRF = 100;
@@ -141,7 +134,6 @@ public String lc() {
public static boolean updateLightingWhenHidingFacades = false;
public static boolean transparentFacesLetThroughBeaconBeam = true;
public static boolean travelAnchorEnabled = true;
public static int travelAnchorMaximumDistance = 96;
public static int travelAnchorCooldown = 0;
public static boolean travelAnchorSneak = true;
@@ -217,7 +209,6 @@ public String lc() {
public static double darkSteelSwordEnderPearlDropChance = 1.05;
public static double darkSteelSwordEnderPearlDropChancePerLooting = 0.5;
public static boolean darkSteelBowEnabled = true;
public static float darkSteelBowDamageBonus = 0f;
public static double[] darkSteelBowForceMultipliers = {1.1f, 1.2f, 1.3f, 1.4f, 1.5f};
public static int[] darkSteelBowDrawSpeeds = {30, 20, 18, 16, 14};
@@ -687,18 +678,6 @@ public static void processConfig(Configuration config) {
"The final XP cost for an enchantment is multiplied by this value. To halve costs set to 0.5, to double them set it to 2").getDouble(enchanterLevelCostFactor);
enchanterLapisCostFactor = config.get(sectionRecipe.name, "enchanterLapisCostFactor", enchanterLapisCostFactor,
"The lapis cost is enchant level multiplied by this value").getDouble(enchanterLapisCostFactor);
photovoltaicCellEnabled = config.get(sectionItems.name, "photovoltaicCellEnabled", photovoltaicCellEnabled,
"If set to false: Photovoltaic Cells will not be craftable.")
.getBoolean(photovoltaicCellEnabled);
reservoirEnabled= config.get(sectionItems.name, "reservoirEnabled", reservoirEnabled,
"If set to false reservoirs will not be craftable.")
.getBoolean(reservoirEnabled);
transceiverEnabled = config.get(sectionItems.name, "transceiverEnabled", transceiverEnabled,
"If set to false: Dimensional Transceivers will not be craftable.")
.getBoolean(transceiverEnabled);
maxPhotovoltaicOutputRF = config.get(sectionPower.name, "maxPhotovoltaicOutputRF", maxPhotovoltaicOutputRF,
"Maximum output in RF/t of the Photovoltaic Panels.").getInt(maxPhotovoltaicOutputRF);
@@ -788,12 +767,6 @@ public static void processConfig(Configuration config) {
vacuumChestRange = config.get(sectionEfficiency.name, "vacumChestRange", vacuumChestRange, "The range of the vacuum chest").getInt(vacuumChestRange);
reinforcedObsidianEnabled = config.get(sectionItems.name, "reinforcedObsidianEnabled", reinforcedObsidianEnabled,
"When set to false reinforced obsidian is not craftable.").getBoolean(reinforcedObsidianEnabled);
travelAnchorEnabled = config.get(sectionItems.name, "travelAnchorEnabled", travelAnchorEnabled,
"When set to false: the travel anchor will not be craftable.").getBoolean(travelAnchorEnabled);
travelAnchorMaximumDistance = config.get(sectionAnchor.name, "travelAnchorMaxDistance", travelAnchorMaximumDistance,
"Maximum number of blocks that can be traveled from one travel anchor to another.").getInt(travelAnchorMaximumDistance);
@@ -1069,7 +1042,6 @@ public static void processConfig(Configuration config) {
darkSteelSwordEnderPearlDropChancePerLooting);
darkSteelBowEnabled = config.getBoolean("darkSteelBowEnabled", sectionItems.name, darkSteelBowEnabled, "If false the Dark Steel Bow will be disabled");
darkSteelBowDamageBonus = (float) config
.get(sectionDarkSteel.name, "darkSteelBowDamageBonus", darkSteelBowDamageBonus, "The damage bonus applied to arrows fire from the bow.")
.getDouble(darkSteelBowDamageBonus);
@@ -13,7 +13,6 @@
@Override
public void toBytes(ByteBuf buf) {
buf.writeBoolean(Config.travelAnchorEnabled);
buf.writeInt(Config.travelAnchorMaximumDistance);
buf.writeBoolean(Config.travelStaffBlinkEnabled);
buf.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled);
@@ -30,7 +29,6 @@ public void toBytes(ByteBuf buf) {
@Override
public void fromBytes(ByteBuf data) {
Config.travelAnchorEnabled = data.readBoolean();
Config.travelAnchorMaximumDistance = data.readInt();
Config.travelStaffBlinkEnabled = data.readBoolean();
Config.travelStaffBlinkThroughSolidBlocksEnabled = data.readBoolean();
@@ -1,7 +1,6 @@
package crazypants.enderio.item.darksteel;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.ItemMagnet;
import crazypants.enderio.item.darksteel.upgrade.EnergyUpgradePowerAdapter;
import crazypants.enderio.machine.MachineRecipeRegistry;
@@ -44,9 +43,7 @@ public static void createDarkSteelArmorItems() {
itemDarkSteelSword = ItemDarkSteelSword.create();
itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create();
itemDarkSteelAxe = ItemDarkSteelAxe.create();
if (Config.darkSteelBowEnabled) {
itemDarkSteelBow = ItemDarkSteelBow.create();
}
itemDarkSteelBow = ItemDarkSteelBow.create();
itemDarkSteelShears = ItemDarkSteelShears.create();
itemMagnet = ItemMagnet.create();
@@ -67,9 +64,7 @@ public static void onClientPreInit() {
ClientUtil.registerRenderer(DarkSteelItems.itemDarkSteelSword, DarkSteelItems.itemDarkSteelSword.getItemName());
ClientUtil.registerRenderer(DarkSteelItems.itemDarkSteelShears, DarkSteelItems.itemDarkSteelShears.getItemName());
ClientUtil.registerRenderer(DarkSteelItems.itemDarkSteelPickaxe, DarkSteelItems.itemDarkSteelPickaxe.getItemName());
if (Config.darkSteelBowEnabled) {
ClientUtil.registerRenderer(DarkSteelItems.itemDarkSteelBow, ItemDarkSteelBow.NAME);
}
ClientUtil.registerRenderer(DarkSteelItems.itemDarkSteelBow, ItemDarkSteelBow.NAME);
ClientUtil.registerRenderer(itemMagnet, ModObject.itemMagnet.getUnlocalisedName());
}
@@ -12,7 +12,6 @@
import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.fluid.SmartTank;
import crazypants.enderio.render.IBlockStateWrapper;
import crazypants.enderio.render.IHaveTESR;
@@ -80,7 +79,7 @@ protected void init() {
@Override
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
if (tab != null && Config.reservoirEnabled) {
if (tab != null) {
super.getSubBlocks(itemIn, tab, list);
}
}
@@ -12,7 +12,6 @@
import com.enderio.core.common.fluid.FluidWrapper;
import crazypants.enderio.TileEntityEio;
import crazypants.enderio.config.Config;
import crazypants.enderio.fluid.SmartTank;
import crazypants.enderio.fluid.SmartTankFluidHandler;
import crazypants.enderio.fluid.SmartTankFluidReservoirHandler;
@@ -148,7 +147,7 @@ public void doUpdate() {
if (tankDirty || !tank.isFull() || !canRefill) {
canRefill = hasEnoughLiquid();
}
} else if (Config.reservoirEnabled && shouldDoWorkThisTick(10, -1) && canRefill && !tank.isFull()) {
} else if (canRefill && !tank.isFull() && shouldDoWorkThisTick(10, -1)) {
tank.addFluidAmount(Fluid.BUCKET_VOLUME / 2);
setTanksDirty();
}
@@ -8,7 +8,6 @@
import crazypants.enderio.BlockEio;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.integration.waila.IWailaInfoProvider;
import crazypants.enderio.render.IBlockStateWrapper;
import crazypants.enderio.render.IRenderMapper.IItemRenderMapper;
@@ -51,9 +50,6 @@ public static BlockSolarPanel create() {
private BlockSolarPanel() {
super(ModObject.blockSolarPanel.getUnlocalisedName(), TileEntitySolarPanel.class);
if(!Config.photovoltaicCellEnabled) {
setCreativeTab(null);
}
setLightOpacity(255);
useNeighborBrightness = true;
setDefaultState(this.blockState.getBaseState().withProperty(EnumMergingBlockRenderMode.RENDER, EnumMergingBlockRenderMode.AUTO)
@@ -13,7 +13,6 @@
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiID;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.machine.IoMode;
import crazypants.enderio.machine.RenderMappers;
@@ -65,9 +64,6 @@ public static BlockTransceiver create() {
private BlockTransceiver() {
super(ModObject.blockTransceiver, TileTransceiver.class);
if (!Config.transceiverEnabled) {
setCreativeTab(null);
}
}
@SideOnly(Side.CLIENT)
@@ -1,6 +1,5 @@
package crazypants.enderio.material;
import crazypants.enderio.config.Config;
import crazypants.enderio.material.fusedQuartz.FusedQuartzType;
import net.minecraft.init.Items;
import net.minecraft.item.EnumDyeColor;
@@ -101,9 +100,7 @@ public static void addRecipes() {
}
}
}
if(Config.darkSteelBowEnabled) {
GameRegistry.addRecipe(new NutritiousStickRecipe());
}
GameRegistry.addRecipe(new NutritiousStickRecipe());
}
}
@@ -115,7 +115,7 @@ public boolean activateTravelAccessable(ItemStack equipped, EnumHand hand, World
return true;
}
}
if (Config.travelAnchorEnabled && doesHandAllowTravel(hand)) {
if (doesHandAllowTravel(hand)) {
travelToSelectedTarget(player, equipped, hand, source, false);
return true;
}
@@ -609,7 +609,7 @@ private void onInput(EntityPlayerSP player) {
}
}
if (Config.travelAnchorEnabled && travelToSelectedTarget(player, null, null, TravelSource.BLOCK, false)) {
if (travelToSelectedTarget(player, null, null, TravelSource.BLOCK, false)) {
input.jump = false;
try {
ObfuscationReflectionHelper.setPrivateValue(EntityPlayer.class, (EntityPlayer) player, 0, "flyToggleTimer", "field_71101_bC");
@@ -11,7 +11,6 @@
import crazypants.enderio.GuiID;
import crazypants.enderio.ModObject;
import crazypants.enderio.api.teleport.ITravelAccessable;
import crazypants.enderio.config.Config;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.paint.IPaintable;
import crazypants.enderio.paint.PainterUtil2;
@@ -78,9 +77,6 @@
private BlockTravelAnchor(Class<T> clz) {
super(ModObject.blockTravelAnchor.getUnlocalisedName(), clz);
if (!Config.travelAnchorEnabled) {
setCreativeTab(null);
}
initDefaultState();
}

0 comments on commit 505cbcf

Please sign in to comment.