mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Remove BC api that's failing to compile and disable integration in the mod, until it gets updated
This commit is contained in:
79 files changed
+15
-2190
No files matched your search
@@ -39,7 +39,6 @@ import vazkii.botania.client.model.GunModel;
|
||||
import vazkii.botania.client.model.LexiconModel;
|
||||
import vazkii.botania.client.model.PlatformModel;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.integration.buildcraft.TriggerManaLevel;
|
||||
import vazkii.botania.common.item.ItemSparkUpgrade;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
|
||||
import vazkii.botania.common.item.relic.ItemKingKey;
|
||||
@@ -70,7 +69,7 @@ public class MiscellaneousIcons {
|
||||
|
||||
public TextureAtlasSprite[] sparkUpgradeIcons;
|
||||
public TextureAtlasSprite[] kingKeyWeaponIcons;
|
||||
public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
|
||||
// todo buildcraft public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
|
||||
public TextureAtlasSprite[] tiaraWingIcons;
|
||||
public TextureAtlasSprite[] thirdEyeLayers;
|
||||
|
||||
@@ -156,9 +155,9 @@ public class MiscellaneousIcons {
|
||||
manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items");
|
||||
runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items");
|
||||
|
||||
for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) {
|
||||
/*for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { todo buildcraft
|
||||
manaLevelTriggerIcons.put(s, IconHelper.forName(evt.getMap(), "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items"));
|
||||
}
|
||||
}*/
|
||||
|
||||
tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES];
|
||||
for (int i = 0; i < tiaraWingIcons.length; i++) {
|
||||
|
||||
@@ -85,7 +85,6 @@ import vazkii.botania.common.entity.EntityPinkWither;
|
||||
import vazkii.botania.common.entity.EntitySignalFlare;
|
||||
import vazkii.botania.common.entity.EntitySpark;
|
||||
import vazkii.botania.common.entity.ModEntities;
|
||||
import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
@@ -181,7 +180,7 @@ public class Botania {
|
||||
FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName());
|
||||
|
||||
if(Botania.bcTriggersLoaded)
|
||||
new StatementAPIPlugin();
|
||||
// todo buildcraft new StatementAPIPlugin();
|
||||
proxy.init(event);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@ import java.util.List;
|
||||
import baubles.api.BaublesApi;
|
||||
import baubles.common.network.PacketHandler;
|
||||
import baubles.common.network.PacketSync;
|
||||
import buildcraft.api.transport.IPipeTile;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
@@ -236,7 +235,7 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
@Override
|
||||
@Optional.Method(modid = "BuildCraft|Transport")
|
||||
public boolean isBuildcraftPipe(TileEntity tile) {
|
||||
return tile instanceof IPipeTile;
|
||||
return false; // tile instanceof IPipeTile; todo buildcraft
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -61,3 +62,4 @@ public class StatementAPIPlugin implements ITriggerProvider {
|
||||
return list;
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import buildcraft.api.statements.IStatement;
|
||||
@@ -32,3 +33,4 @@ public abstract class StatementBase implements IStatement {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
@@ -49,3 +50,4 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import org.apache.commons.lang3.text.WordUtils;
|
||||
@@ -60,3 +61,4 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal
|
||||
return false;
|
||||
}
|
||||
}
|
||||
*/
|
||||
+2
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
package vazkii.botania.common.integration.buildcraft;
|
||||
|
||||
import buildcraft.api.statements.IStatementContainer;
|
||||
@@ -38,3 +39,4 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
Reference in new issue
Block a user