Skip to content

Commit a951af3

Browse files
committed
"Fix" the gas detector, it at least does not crash the game, but does not work properly, need to be checked before a release.
1 parent c2fb662 commit a951af3

6 files changed

Lines changed: 19 additions & 11 deletions

File tree

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import de.srendi.advancedperipherals.common.addons.computercraft.integrations.IntegrationPeripheralProvider;
1010
import de.srendi.advancedperipherals.common.addons.refinedstorage.RSApi;
1111
import de.srendi.advancedperipherals.common.blocks.base.ICapabilityProvider;
12+
import de.srendi.advancedperipherals.common.blocks.blockentities.GasDetectorEntity;
1213
import de.srendi.advancedperipherals.common.configuration.APConfig;
1314
import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
1415
import de.srendi.advancedperipherals.common.setup.APItems;
@@ -138,6 +139,13 @@ public void registerCapabilities(RegisterCapabilitiesEvent event) {
138139
? provider.createEnergyStorageCap(side)
139140
: null
140141
);
142+
event.registerBlockEntity(
143+
mekanism.common.capabilities.Capabilities.CHEMICAL.block(),
144+
entry.get(),
145+
(blockEntity, side) -> blockEntity instanceof GasDetectorEntity provider
146+
? provider.createProxy()
147+
: null
148+
);
141149
});
142150

143151
ItemLike[] smartGlasses = new ItemLike[]{

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/GasDetectorEntity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package de.srendi.advancedperipherals.common.blocks.blockentities;
22

3-
import com.refinedmods.refinedstorage.mekanism.ChemicalUtil;
43
import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.GasDetectorPeripheral;
54
import de.srendi.advancedperipherals.common.blocks.base.BaseDetectorEntity;
65
import de.srendi.advancedperipherals.common.configuration.APConfig;
76
import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
87
import de.srendi.advancedperipherals.common.util.proxy.GasStorageProxy;
98
import de.srendi.advancedperipherals.common.util.proxy.ZeroGasTank;
109
import mekanism.api.chemical.IChemicalHandler;
10+
import mekanism.common.capabilities.Capabilities;
1111
import net.minecraft.core.BlockPos;
1212
import net.minecraft.world.level.block.state.BlockState;
1313
import org.jetbrains.annotations.NotNull;
@@ -18,7 +18,8 @@ public class GasDetectorEntity extends BaseDetectorEntity<IChemicalHandler, GasS
1818
private static final IChemicalHandler ZERO_STORAGE = new ZeroGasTank();
1919

2020
public GasDetectorEntity(BlockPos pos, BlockState state) {
21-
super(APBlockEntityTypes.GAS_DETECTOR.get(), pos, state, ChemicalUtil.BLOCK_CAPABILITY);
21+
//TODO: Does still not work, transfers chemicals but without a rate limit and without monitoring the transfer rate
22+
super(APBlockEntityTypes.GAS_DETECTOR.get(), pos, state, Capabilities.CHEMICAL.block());
2223
}
2324

2425
@Override
@@ -29,7 +30,7 @@ protected GasDetectorPeripheral buildPeripheral() {
2930

3031
@Override
3132
@NotNull
32-
protected GasStorageProxy createProxy() {
33+
public GasStorageProxy createProxy() {
3334
return new GasStorageProxy(this, APConfig.PERIPHERALS_CONFIG.gasDetectorMaxFlow.get());
3435
}
3536

0 commit comments

Comments
 (0)