Compare commits

..
18 Commits
Author SHA1 Message Date
Martin Robertz 0d4e1e70ca derp 2023-03-12 16:48:34 +01:00
Martin Robertz 4685ed3247 update dep file 2023-03-12 14:38:46 +01:00
Martin Robertz 3a9c156a33 update bs 2023-03-12 14:36:44 +01:00
Martin Robertz af0eff4809 Merge remote-tracking branch 'Pilzinsel64/meconduit-denseultra' into dev 2023-03-12 14:33:55 +01:00
Pilzinsel64 12d7ae70b1 Merge branch 'GTNewHorizons:master' into meconduit-denseultra 2023-03-05 17:14:14 +01:00
Pilzinsel64 58b1bbb880 fix texture 2023-03-03 17:08:24 +01:00
Pilzinsel64 1ea892dce8 Merge branch 'meconduit-denseultra' of https://github.com/Pilzinsel64/EnderIO into meconduit-denseultra 2023-03-03 15:31:42 +01:00
Pilzinsel64 87ce76f65e spottlessApply 2023-03-03 15:31:39 +01:00
Pilzinsel64 b543842065 Merge branch 'GTNewHorizons:master' into meconduit-denseultra 2023-03-03 15:30:57 +01:00
Pilzinsel64 8647052ab2 fix enableMEUltraDenseConduits 2023-03-03 15:25:45 +01:00
Pilzinsel64 e8a995ce84 adjust meConduitCoreDenseUltra.png 2023-03-03 15:13:06 +01:00
Pilzinsel64 ef71726fb0 edit texture a little bit more 2023-03-03 15:11:29 +01:00
Pilzinsel64 f264321597 add configu for Ultra Dense ME Conduits 2023-03-03 15:04:13 +01:00
Pilzinsel64 dabe03da71 finalize ultra dense me conduits 2023-03-03 14:39:25 +01:00
Pilzinsel64 aea6b0fa09 fix previous commit 2023-02-08 13:26:24 +01:00
Pilzinsel64 c7cfa5e82c fix icon array count 2023-02-08 08:45:53 +01:00
Pilzinsel64 c0ac90767f add assets for ME Conduit Dense Ultra 2023-02-08 08:45:38 +01:00
Pilzinsel64 f4a0ee804b basic MEConduit DenseUltra implementation 2023-02-08 08:22:03 +01:00
4 changed files with 23 additions and 69 deletions

No files matched your search

+4 -4
View File
@@ -1,4 +1,4 @@
//version: 1677938302
//version: 1678003329
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -73,7 +73,7 @@ plugins {
id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.2.2'
id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
@@ -153,7 +153,7 @@ java {
} else {
languageVersion.set(projectJavaVersion)
}
vendor.set(JvmVendorSpec.ADOPTIUM)
vendor.set(JvmVendorSpec.AZUL)
}
if (!noPublishedSources) {
withSourcesJar()
@@ -222,7 +222,7 @@ if (enableModernJavaSyntax.toBoolean()) {
javaCompiler.set(javaToolchains.compilerFor {
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.ADOPTIUM)
vendor.set(JvmVendorSpec.AZUL)
})
}
}
+8 -8
View File
@@ -3,17 +3,17 @@
dependencies {
api('com.github.GTNewHorizons:EnderCore:0.2.13:dev')
implementation('com.github.GTNewHorizons:ForestryMC:4.5.8:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.35-GTNH:dev')
api('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.39-GTNH:dev')
api('com.github.GTNewHorizons:BuildCraft:7.1.31:dev')
api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
shadowImplementation('cglib:cglib-nodep:3.3.0')
compileOnly('com.github.GTNewHorizons:waila:1.5.23:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-168-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false}
implementation('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:waila:1.5.24:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-175-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.13.19:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.20-GTNH:api') {transitive = false}
implementation('com.github.GTNewHorizons:Chisel:2.10.17-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.8.0.13-GTNH:api') {transitive = false}
compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
@@ -84,16 +84,6 @@ public abstract class AbstractConduit implements IConduit {
protected boolean connectionsDirty = true;
/**
* This shows if the currently running connection update should not finish with settings connectionsDirty to false.
* If this is true, it will trigger a reconnection on the next Tick.
* <p>
* Use the method needUpdateConnections() instead of setting this to true.
*
* @see needUpdateConnections()
*/
protected boolean needUpdateConnections = false;
protected AbstractConduit() {}
@Override
@@ -471,24 +461,7 @@ public abstract class AbstractConduit implements IConduit {
connectionsChanged();
}
if (needUpdateConnections) {
// Seems the update was not successfull, let's try on the next Tick.
needUpdateConnections = false;
} else {
connectionsDirty = false;
}
}
/**
* This method prevents connection update from getting completed successfully by not settings connectionsDirty to
* false. This will trigger an connection update at the next Tick.
* <p>
* Only use this while executing updateConnections().
* <p>
* See this PR for more info: https://github.com/GTNewHorizons/EnderIO/pull/111
*/
protected void needUpdateConnections() {
needUpdateConnections = true;
connectionsDirty = false;
}
@Override
@@ -13,7 +13,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.networking.GridFlags;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
@@ -163,44 +162,26 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
// because the AE2 API doesn't allow an easy query like "which side can connect to an ME cable" it needs this
// mess
IGridNode node = null;
if (te instanceof IPartHost) {
IPart part = ((IPartHost) te).getPart(dir.getOpposite());
if (part == null) {
part = ((IPartHost) te).getPart(ForgeDirection.UNKNOWN);
return part != null;
}
if (part != null) {
node = part.getExternalFacingNode();
if (node == null) {
node = part.getGridNode();
}
if (node == null) {
// The GridNode has not been initialized yet, let's try on the next Tick.
needUpdateConnections();
}
if (part.getExternalFacingNode() != null) {
return true;
}
String name = part.getClass().getSimpleName();
return "PartP2PTunnelME".equals(name) || "PartQuartzFiber".endsWith(name)
|| "PartToggleBus".equals(name)
|| "PartInvertedToggleBus".equals(name);
} else if (te instanceof IGridHost) {
node = ((IGridHost) te).getGridNode(dir.getOpposite());
IGridNode node = ((IGridHost) te).getGridNode(dir.getOpposite());
if (node == null) {
node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN);
}
}
if (node != null) {
return canConnectToGridNode(node, dir);
}
return false;
}
@Method(modid = "appliedenergistics2")
private Boolean canConnectToGridNode(IGridNode node, ForgeDirection dir) {
if (node.getGridBlock().getConnectableSides().contains(dir.getOpposite())) {
if (isDenseUltra()) {
return node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY)
|| ((node.hasFlag(GridFlags.DENSE_CAPACITY)) && !node.hasFlag(GridFlags.CANNOT_CARRY));
} else if (isDense()) {
return true;
} else {
return !node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY);
if (node != null) {
return node.getGridBlock().getConnectableSides().contains(dir.getOpposite());
}
}
return false;