diff options
| author | Tec <daniel112092@gmail.com> | 2020-04-08 00:11:30 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2020-04-08 00:11:30 +0200 |
| commit | 4166b36baafc19f12ca24c9974934361c1afbdc9 (patch) | |
| tree | c8b85c7864e8924e985077cd6c6167a01d010264 /src/main | |
| parent | 8623e13fb89f290fdb37e21e494baf9fca2c2411 (diff) | |
| download | GT5-Unofficial-4166b36baafc19f12ca24c9974934361c1afbdc9.tar.gz GT5-Unofficial-4166b36baafc19f12ca24c9974934361c1afbdc9.tar.bz2 GT5-Unofficial-4166b36baafc19f12ca24c9974934361c1afbdc9.zip | |
Fix blocks
Diffstat (limited to 'src/main')
4 files changed, 10 insertions, 8 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 79defc0a1a..9694dadfd3 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -98,7 +98,6 @@ public class TecTech { public void Load(FMLInitializationEvent event) { hasCOFH = Loader.isModLoaded(Reference.COFHCORE); - if(configTecTech.DISABLE_MATERIAL_LOADING_FFS){ try { Field modifiersField = Field.class.getDeclaredField( "modifiers" ); diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 7e9a90961e..1bf95a1936 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -28,6 +28,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.fluids.Fluid; @@ -339,23 +340,23 @@ public final class MainLoader { for(Block block : GameData.getBlockRegistry().typeSafeIterable()) { GameRegistry.UniqueIdentifier uniqueIdentifier=GameRegistry.findUniqueIdentifierFor(block); if (uniqueIdentifier != null) { - if (modIDs.contains(uniqueIdentifier.modId)) {//Full Whitelisted Mods + if (block.blockHardness < 0 || modIDs.contains(uniqueIdentifier.modId)) { continue; } else if ("OpenBlocks".equals(uniqueIdentifier.modId)) { if ("grave".equals(uniqueIdentifier.name)) { continue; } - } else if ("TwilightForest".equals(uniqueIdentifier.modId)){ - if ("tile.TFShield".equals(uniqueIdentifier.name)){ + } else if ("TwilightForest".equals(uniqueIdentifier.modId)) { + if ("tile.TFShield".equals(uniqueIdentifier.name)) { block.setResistance(30); continue; - }else if ("tile.TFThorns".equals(uniqueIdentifier.name)){ + } else if ("tile.TFThorns".equals(uniqueIdentifier.name)) { block.setResistance(10); continue; - }else if ("tile.TFTowerTranslucent".equals(uniqueIdentifier.name)){ + } else if ("tile.TFTowerTranslucent".equals(uniqueIdentifier.name)) { block.setResistance(30); continue; - }else if ("tile.TFDeadrock".equals(uniqueIdentifier.name)) { + } else if ("tile.TFDeadrock".equals(uniqueIdentifier.name)) { block.setResistance(5); continue; } else { diff --git a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java index fd351631f3..26b83eb1f1 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java +++ b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java @@ -4,7 +4,7 @@ import com.github.technus.avrClone.AvrCore; import com.github.technus.avrClone.registerPackages.*; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity> { +public class SidedRedstone extends RegisterPackageSync<IGregTechTileEntity,SidedRedstone> { public static final RSINT RSINT =new RSINT(); public SidedRedstone(int offset) { diff --git a/src/main/resources/META-INF/tectech_at.cfg b/src/main/resources/META-INF/tectech_at.cfg new file mode 100644 index 0000000000..e09e575a7d --- /dev/null +++ b/src/main/resources/META-INF/tectech_at.cfg @@ -0,0 +1,2 @@ +public net.minecraft.block.Block field_149781_w #blockResistance +public net.minecraft.block.Block field_149782_v #blockHardness
\ No newline at end of file |