fix: sink & source tiers
This commit is contained in:
parent
563b5b60ea
commit
df6df43ef2
14
build.gradle
14
build.gradle
|
@ -11,7 +11,9 @@ buildscript {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
|
||||||
|
changing = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +36,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile ic2Version
|
implementation ic2Version
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,13 +44,7 @@ processResources {
|
||||||
inputs.property "version", project.version
|
inputs.property "version", project.version
|
||||||
inputs.property "mcversion", project.minecraft.version
|
inputs.property "mcversion", project.minecraft.version
|
||||||
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
filesMatching('mcmod.info') {
|
||||||
include 'mcmod.info'
|
|
||||||
|
|
||||||
expand 'version':project.version, 'mcversion':project.minecraft.version
|
expand 'version':project.version, 'mcversion':project.minecraft.version
|
||||||
}
|
}
|
||||||
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
exclude 'mcmod.info'
|
|
||||||
}
|
|
||||||
}
|
}
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
||||||
|
|
|
@ -279,19 +279,19 @@ public class BlockAdvPwrMan extends BlockContainer{
|
||||||
return new TEChargingBench(1);
|
return new TEChargingBench(1);
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
return new TEChargingBench(3);
|
return new TEChargingBench(2);
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
return new TEChargingBench(4);
|
return new TEChargingBench(3);
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
return new TEAdvEmitter(1); // Update old emitter tier 1
|
return new TEAdvEmitter(1); // Update old emitter tier 1
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
return new TEAdvEmitter(3); // Update old emitter tier 2
|
return new TEAdvEmitter(2); // Update old emitter tier 2
|
||||||
|
|
||||||
case 5:
|
case 5:
|
||||||
return new TEAdvEmitter(4); // Update old emitter tier 3
|
return new TEAdvEmitter(3); // Update old emitter tier 3
|
||||||
|
|
||||||
case 6:
|
case 6:
|
||||||
return new TEAdjustableTransformer();
|
return new TEAdjustableTransformer();
|
||||||
|
@ -303,10 +303,10 @@ public class BlockAdvPwrMan extends BlockContainer{
|
||||||
return new TEBatteryStation(1);
|
return new TEBatteryStation(1);
|
||||||
|
|
||||||
case 9:
|
case 9:
|
||||||
return new TEBatteryStation(3);
|
return new TEBatteryStation(2);
|
||||||
|
|
||||||
case 10:
|
case 10:
|
||||||
return new TEBatteryStation(4);
|
return new TEBatteryStation(3);
|
||||||
|
|
||||||
case 11:
|
case 11:
|
||||||
return new TEStorageMonitor();
|
return new TEStorageMonitor();
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class TEBatteryStation extends TECommonBench implements IEnergySource, II
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getSourceTier(){
|
public int getSourceTier(){
|
||||||
return 4; // XXX: cause I dunno what to put... / READ THE JAVADOC YOU NOOB - xbony2
|
return powerTier; // XXX: cause I dunno what to put... / READ THE JAVADOC YOU NOOB - xbony2
|
||||||
}
|
}
|
||||||
|
|
||||||
// End IC2 API
|
// End IC2 API
|
||||||
|
|
|
@ -8,6 +8,7 @@ import ic2.api.Direction;
|
||||||
import ic2.api.item.ElectricItem;
|
import ic2.api.item.ElectricItem;
|
||||||
import ic2.api.item.IElectricItem;
|
import ic2.api.item.IElectricItem;
|
||||||
import ic2.api.tile.IEnergyStorage;
|
import ic2.api.tile.IEnergyStorage;
|
||||||
|
import ic2.api.energy.EnergyNet;
|
||||||
import ic2.api.energy.event.EnergyTileLoadEvent;
|
import ic2.api.energy.event.EnergyTileLoadEvent;
|
||||||
import ic2.api.energy.tile.IEnergySink;
|
import ic2.api.energy.tile.IEnergySink;
|
||||||
import ic2.core.IC2;
|
import ic2.core.IC2;
|
||||||
|
@ -99,7 +100,7 @@ public class TEChargingBench extends TECommonBench implements IEnergySink, IEner
|
||||||
// System.out.println("Initializing - BaseTier: " + baseTier);
|
// System.out.println("Initializing - BaseTier: " + baseTier);
|
||||||
|
|
||||||
// Max Input math = 32 for tier 1, 128 for tier 2, 512 for tier 3
|
// Max Input math = 32 for tier 1, 128 for tier 2, 512 for tier 3
|
||||||
baseMaxInput = (int) Math.pow(2.0D, (double) (2 * baseTier + 3));
|
baseMaxInput = (int) EnergyNet.instance.getPowerFromTier(baseTier);
|
||||||
// if (ChargingBench.isDebugging) System.out.println("BaseMaxInput: " +
|
// if (ChargingBench.isDebugging) System.out.println("BaseMaxInput: " +
|
||||||
// baseMaxInput);
|
// baseMaxInput);
|
||||||
|
|
||||||
|
@ -158,7 +159,7 @@ public class TEChargingBench extends TECommonBench implements IEnergySink, IEner
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getSinkTier(){
|
public int getSinkTier(){
|
||||||
return adjustedMaxInput;
|
return powerTier;
|
||||||
}
|
}
|
||||||
|
|
||||||
// IEnergyStorage
|
// IEnergyStorage
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
blockChargingBench1.name=LV Charging Bench
|
blockChargingBench1.name=LV Charging Bench
|
||||||
blockChargingBench2.name=HV Charging Bench
|
blockChargingBench2.name=MV Charging Bench
|
||||||
blockChargingBench3.name=EV Charging Bench
|
blockChargingBench3.name=HV Charging Bench
|
||||||
blockEmitterBlock1.name=LV Emitter
|
blockEmitterBlock1.name=LV Emitter
|
||||||
blockEmitterBlock2.name=HV Emitter
|
blockEmitterBlock2.name=MV Emitter
|
||||||
blockEmitterBlock3.name=EV Emitter
|
blockEmitterBlock3.name=HV Emitter
|
||||||
blockAdjustableTransformer.name=Adjustable Transformer
|
blockAdjustableTransformer.name=Adjustable Transformer
|
||||||
blockEmitterAdjustable.name=Adjustable Emitter
|
blockEmitterAdjustable.name=Adjustable Emitter
|
||||||
blockBatteryStation1.name=LV Battery Station
|
blockBatteryStation1.name=LV Battery Station
|
||||||
blockBatteryStation2.name=HV Battery Station
|
blockBatteryStation2.name=MV Battery Station
|
||||||
blockBatteryStation3.name=EV Battery Station
|
blockBatteryStation3.name=HV Battery Station
|
||||||
blockStorageMonitor.name=Storage Monitor
|
blockStorageMonitor.name=Storage Monitor
|
||||||
|
|
||||||
AdvPwrMan.dir.down=Down
|
AdvPwrMan.dir.down=Down
|
||||||
|
|
Loading…
Reference in a new issue