dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.8.5 done

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-04 23:03:54 +02:00
parent ef17a6dc8e
commit 83cab186fd
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Refined Storage Changelog # Refined Storage Changelog
### 0.8.5
**Bugfixes**
- Fixed crash when Tesla API is not installed
### 0.8.4 ### 0.8.4
**Bugfixes** **Bugfixes**
- Removed delay until grid items are visible - Removed delay until grid items are visible

2
build.gradle
View File

@@ -12,7 +12,7 @@ buildscript {
} }
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
version = "0.8.4" version = "0.8.5"
group = "refinedstorage" group = "refinedstorage"
archivesBaseName = "refinedstorage" archivesBaseName = "refinedstorage"

4
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -139,4 +139,8 @@ public final class RefinedStorage {
public static boolean hasIC2() { public static boolean hasIC2() {
return Loader.isModLoaded("IC2"); return Loader.isModLoaded("IC2");
} }
public static boolean hasTesla() {
return Loader.isModLoaded("Tesla");
}
} }

4
src/main/java/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -322,12 +322,12 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle
@Override @Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) { public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing) {
return capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER; return RefinedStorage.hasTesla() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER);
} }
@Override @Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) { public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER) { if (RefinedStorage.hasTesla() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)) {
return (T) new TeslaEnergy(stack); return (T) new TeslaEnergy(stack);
} }

4
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -738,7 +738,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override @Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) { public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER) { if (RefinedStorage.hasTesla() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)) {
return (T) this; return (T) this;
} }
@@ -747,6 +747,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
return capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER || super.hasCapability(capability, facing); return (RefinedStorage.hasTesla() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)) || super.hasCapability(capability, facing);
} }
} }