Build 1.7-30
This commit is contained in:
parent
9616e310a6
commit
51e139b568
|
@ -1,7 +1,7 @@
|
|||
import groovy.json.JsonOutput
|
||||
|
||||
def mainVersion = "1.7"
|
||||
def buildNumber = "29"
|
||||
def buildNumber = "30"
|
||||
|
||||
// For those who want the bleeding edge
|
||||
buildscript {
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
"1.10.2-recommended": "1.4-18",
|
||||
"1.11.2-latest": "1.5-19",
|
||||
"1.11.2-recommended": "1.5-19",
|
||||
"1.12.2-latest": "1.7-29",
|
||||
"1.12.2-recommended": "1.7-29"
|
||||
"1.12.2-latest": "1.7-30",
|
||||
"1.12.2-recommended": "1.7-30"
|
||||
},
|
||||
"1.10.2": {
|
||||
"1.1-3": " - fixed incompatibility with IE build 48\n - reduced the amount of calls to core IE classes to make such incompatibilities less likely\n - fixed localization of the creative tab",
|
||||
|
@ -39,6 +39,7 @@
|
|||
"1.7-26": " - Added Mechanical Multiblocks (energy storage and EU<->FE conversion)\n - There will be an explanation video for these once I have time to make one\n - Fixed the small mechanical converter blowing up tin wires\n - Fixed wires not joining their outputs correctly\n - Fixed wire connectors not breaking when the block they're on is broken",
|
||||
"1.7-27": " - Fixed panel components causing issues on dedicated servers\n - Added an automatic update checker (Using the Forge update JSON)",
|
||||
"1.7-28": " - Added the Redstone Controller: Others, it allows control panels to interface with Project:Red and Charset wires\n - Rewrote the control panel redstone code\n - Added localization for IW's multiblocks\n - Fixed issues with zero-length mechanical multiblocks",
|
||||
"1.7-29": " - The wires can now transmit FE as well as EU, but not both at once\n - Fixed the Marx generator not charging beyond a quite low voltage"
|
||||
"1.7-29": " - The wires can now transmit FE as well as EU, but not both at once\n - Fixed the Marx generator not charging beyond a quite low voltage",
|
||||
"1.7-30": " - Fixed crashes when IC2 isn't installed\n - Fixed connectors allowing too much power output\n - Added a config option for some of the wires' properties\n - Updated chinese translation (thanks @DepletedPrism)"
|
||||
}
|
||||
}
|
|
@ -1,5 +1,11 @@
|
|||
###Minecraft 1.12.2
|
||||
|
||||
####Version 1.7-30
|
||||
- Fixed crashes when IC2 isn't installed
|
||||
- Fixed connectors allowing too much power output
|
||||
- Added a config option for some of the wires' properties
|
||||
- Updated chinese translation (thanks @DepletedPrism)
|
||||
|
||||
####Version 1.7-29
|
||||
- The wires can now transmit FE as well as EU, but not both at once
|
||||
- Fixed the Marx generator not charging beyond a quite low voltage
|
||||
|
|
|
@ -35,6 +35,8 @@ public class IWConfig {
|
|||
public static double wireRatio = .5;
|
||||
@Comment({"The EU IO rates of the wires. Order is Tin, Copper, Gold, HV, Glass Fiber"})
|
||||
public static double[] ioRatesEU = {32, 128, 512, 2048, 8192};
|
||||
@Comment({"The EU loss rates of the wires (EU per block). Order is Tin, Copper, Gold, HV, Glass Fiber"})
|
||||
public static double[] euLossPerBlock = {.2, .2, .4, .8, .025};
|
||||
|
||||
@Comment({"Set this to false to completely disable any conversion between IF and EU (default: true)"})
|
||||
@RequiresMcRestart
|
||||
|
|
|
@ -39,8 +39,6 @@ public class MixedWireType extends WireType {
|
|||
private final int[] ic2Colors = {0xa5bcc7, 0xbc7945, 0xfeff73, 0xb9d6d9, 0xf1f1f1};
|
||||
private final String[] ic2Names = {"ic2Tin", "ic2Copper", "ic2Gold", "ic2Hv", "ic2Glass",
|
||||
"ic2TinIns", "ic2CopperIns", "ic2GoldIns"};
|
||||
private final double[] euLossPerBlock = {.2, .2, .4, .8, .025};
|
||||
private final double[] ifLossRate = new double[euLossPerBlock.length];
|
||||
private final double[] ic2RenderDiameter = {
|
||||
.03125, .03125, .046875, .0625, .75 * .03125, .0625, .0625, 2*.046875
|
||||
};
|
||||
|
@ -61,20 +59,16 @@ public class MixedWireType extends WireType {
|
|||
super();
|
||||
this.type = ordinal;
|
||||
WireApi.registerWireType(this);
|
||||
for (int i = 0;i<ifLossRate.length;i++) {
|
||||
//Loss is the same at full single-connector load
|
||||
double lossPerBlockIF = euLossPerBlock[i] * ConversionUtil.ifPerEu();
|
||||
ifLossRate[i] = lossPerBlockIF/(getIORate()*ConversionUtil.ifPerJoule());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getLossRatio() {
|
||||
return ifLossRate[type%5];
|
||||
double lossPerBlockIF = getLossRateEU() * ConversionUtil.ifPerEu();
|
||||
return lossPerBlockIF / (getIORate() * ConversionUtil.ifPerJoule());
|
||||
}
|
||||
|
||||
public double getLossRateEU() {
|
||||
return euLossPerBlock[type%5];
|
||||
return IWConfig.euLossPerBlock[type % 5];
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -4,8 +4,8 @@ tile.industrialwires.ic2_connector.copper_conn.name=Copper Wire Connector
|
|||
tile.industrialwires.ic2_connector.copper_relay.name=Copper Wire Relay
|
||||
tile.industrialwires.ic2_connector.gold_conn.name=Gold Wire Connector
|
||||
tile.industrialwires.ic2_connector.gold_relay.name=Gold Wire Relay
|
||||
tile.industrialwires.ic2_connector.hv_conn.name=IC2 HV Wire Connector
|
||||
tile.industrialwires.ic2_connector.hv_relay.name=IC2 HV Wire Relay
|
||||
tile.industrialwires.ic2_connector.hv_conn.name=Universal HV Wire Connector
|
||||
tile.industrialwires.ic2_connector.hv_relay.name=Universal HV Wire Relay
|
||||
tile.industrialwires.ic2_connector.glass_conn.name=Glass Fiber Wire Connector
|
||||
tile.industrialwires.ic2_connector.glass_relay.name=Glass Fiber Wire Relay
|
||||
|
||||
|
|
Loading…
Reference in a new issue