tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Controller now required for infinite channels

Browse source
This commit is contained in:
Timo Ley 2021-03-19 11:08:34 +01:00
parent 5a2089941d
commit 404b4dbab9
4 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -41,7 +41,7 @@ pneumaticcraft_version=1.9.15-105
# Self Compiled APIs # # Self Compiled APIs #
######################################################### #########################################################
mekansim_version=8.0.1.198 mekansim_version=8.0.1.198
rotarycraft_version=V6e rotarycraft_version=V6f
######################################################### #########################################################

17
gradle/scripts/dependencies.gradle
View file

@ -32,11 +32,6 @@ repositories {
url "http://mobiusstrip.eu/maven" url "http://mobiusstrip.eu/maven"
} }
maven {
name "FireBall API Depot"
url "http://dl.tsr.me/artifactory/libs-release-local"
}
maven { maven {
name = "Player" name = "Player"
url = "http://maven.ic2.player.to/" url = "http://maven.ic2.player.to/"
@ -47,11 +42,6 @@ repositories {
url = "http://maven.tterrag.com/" url = "http://maven.tterrag.com/"
} }
maven {
name = "RX14 Proxy"
url = "http://mvn.rx14.co.uk/repo/"
}
maven { maven {
name "OpenComputers Repo" name "OpenComputers Repo"
url = "http://maven.cil.li/" url = "http://maven.cil.li/"
@ -62,6 +52,11 @@ repositories {
url = "http://maven.k-4u.nl/" url = "http://maven.k-4u.nl/"
} }
maven {
name = "tilera"
url = "https://data.tilera.xyz/maven/"
}
ivy { ivy {
name "BuildCraft" name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
@ -131,7 +126,7 @@ dependencies {
compile "appeng:Waila:${waila_version}_${minecraft_version}:api" compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
compile "appeng:RotaryCraft:${rotarycraft_version}:api" compile "appeng:RotaryCraft:${rotarycraft_version}:api"
compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api" compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
compile "appeng:InventoryTweaks:${invtweaks_version}:api" //compile "appeng:InventoryTweaks:${invtweaks_version}:api"
// self compiled stubs // self compiled stubs
compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}") compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")

7
src/api/java/appeng/api/networking/pathing/ControllerState.java
View file

@ -39,5 +39,10 @@ public enum ControllerState
/** /**
* Controller rules not followed, lock up while booting. * Controller rules not followed, lock up while booting.
*/ */
CONTROLLER_CONFLICT CONTROLLER_CONFLICT,
/**
* Controller is online and has infinite channels
*/
CONTROLLER_INFINITE
} }

10
src/main/java/appeng/me/cache/PathGridCache.java vendored
View file

@ -83,7 +83,7 @@ public class PathGridCache implements IPathingGrid
this.updateNetwork = false; this.updateNetwork = false;
this.setChannelsInUse( 0 ); this.setChannelsInUse( 0 );
if( !AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) if( this.controllerState == ControllerState.CONTROLLER_INFINITE )
{ {
final int used = this.calculateRequiredChannels(); final int used = this.calculateRequiredChannels();
@ -162,7 +162,7 @@ public class PathGridCache implements IPathingGrid
if( this.active.isEmpty() && this.ticksUntilReady <= 0 ) if( this.active.isEmpty() && this.ticksUntilReady <= 0 )
{ {
if( this.controllerState == ControllerState.CONTROLLER_ONLINE ) if( this.controllerState == ControllerState.CONTROLLER_ONLINE || this.controllerState == ControllerState.CONTROLLER_INFINITE)
{ {
final Iterator<TileController> controllerIterator = this.controllers.iterator(); final Iterator<TileController> controllerIterator = this.controllers.iterator();
if( controllerIterator.hasNext() ) if( controllerIterator.hasNext() )
@ -273,7 +273,11 @@ public class PathGridCache implements IPathingGrid
if( cv.isValid() && cv.getFound() == this.controllers.size() ) if( cv.isValid() && cv.getFound() == this.controllers.size() )
{ {
this.controllerState = ControllerState.CONTROLLER_ONLINE; if (AEConfig.instance.isFeatureEnabled( AEFeature.Channels )) {
this.controllerState = ControllerState.CONTROLLER_ONLINE;
} else {
this.controllerState = ControllerState.CONTROLLER_INFINITE;
}
} }
else else
{ {