diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-06 19:57:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 19:57:43 +0200 |
| commit | 38bc165e09d9ea2d00e77aa870344072eb12dcfc (patch) | |
| tree | 006e00e4eb592a103edaed7f25bc1497438270b3 | |
| parent | e0cf222e24b35e4b2e901ca3e045bc255d60728c (diff) | |
| parent | d4be334d82116c6ba822e1ef1a66d9f000e0e2fa (diff) | |
| download | GT5-Unofficial-38bc165e09d9ea2d00e77aa870344072eb12dcfc.tar.gz GT5-Unofficial-38bc165e09d9ea2d00e77aa870344072eb12dcfc.tar.bz2 GT5-Unofficial-38bc165e09d9ea2d00e77aa870344072eb12dcfc.zip | |
Merge pull request #34 from GTNewHorizons/structlib_ICustomBlockSetting_support
Make BW_MetaGeneratedBlocks_Casing implement ICustomBlockSetting from both TecTech & Structlib
Former-commit-id: d3c6cfb75c96cd00259773805953240737e9b936
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gradle.properties b/gradle.properties index 25515abd6a..185e03bb76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 majorUpdate=0 minorUpdate=5 -buildNumber=20 +buildNumber=21 apiVersion=11 ic2Version=2.2.828-experimental applecoreVersion=1.7.10-3.1.1 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java index 74a40e6a28..c892ead1d9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java @@ -22,7 +22,6 @@ package com.github.bartimaeusnek.bartworks.system.material; -import com.github.technus.tectech.mechanics.structure.ICustomBlockSetting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; @@ -41,8 +40,9 @@ import net.minecraft.world.World; import java.util.List; import java.util.Optional; -@cpw.mods.fml.common.Optional.Interface(modid = "tectech", striprefs = true, iface = "com.github.technus.tectech.mechanics.structure.ICustomBlockSetting") -public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks implements ICustomBlockSetting { +public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks implements com.github.technus.tectech.mechanics.structure.ICustomBlockSetting, + com.gtnewhorizon.structurelib.structure.ICustomBlockSetting +{ public BW_MetaGeneratedBlocks_Casing(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName, OrePrefixes prefixes) { super(p_i45386_1_, tileEntity, blockName, prefixes); @@ -128,9 +128,8 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks imple } /** - * DEBUG Method for TT-Blueprints! + * ICustomBlockSetting setBlock override */ - @cpw.mods.fml.common.Optional.Method(modid = "tectech") public void setBlock(World world, int x, int y, int z, int meta) { world.setBlock(x, y, z,this, meta,2); try { |