Restore buildcraft integration (yay)

This commit is contained in:
Vincent Lee committed 2018-09-03 15:25:25 -05:00
1 parent 7dc0bd4670
commit c70f53ceee
10 files changed
+113 -82

No files matched your search

@@ -14,15 +14,20 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.commons.lang3.text.WordUtils;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.model.FloatingFlowerModel;
import vazkii.botania.client.model.GunModel;
import vazkii.botania.client.model.LexiconModel;
import vazkii.botania.client.model.PlatformModel;
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;
import java.util.EnumMap;
import java.util.Map;
public class MiscellaneousIcons {
public static final MiscellaneousIcons INSTANCE = new MiscellaneousIcons();
@@ -49,7 +54,7 @@ public class MiscellaneousIcons {
public TextureAtlasSprite[] sparkUpgradeIcons;
public TextureAtlasSprite[] kingKeyWeaponIcons;
// todo buildcraft public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = new EnumMap<>(TriggerManaLevel.State.class);
public TextureAtlasSprite[] tiaraWingIcons;
public TextureAtlasSprite[] thirdEyeLayers;
@@ -138,9 +143,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()) { todo buildcraft
for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) {
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++) {
@@ -11,7 +11,6 @@
package vazkii.botania.common;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.advancements.ICriterionTrigger;
import net.minecraft.entity.Entity;
import net.minecraft.entity.MultiPartEntityPart;
import net.minecraft.entity.boss.EntityDragon;
@@ -36,7 +35,6 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import vazkii.botania.api.BotaniaAPI;
@@ -47,22 +45,17 @@ import vazkii.botania.common.advancements.*;
import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
import vazkii.botania.common.block.tile.TileLightRelay;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
import vazkii.botania.common.brew.ModBrews;
import vazkii.botania.common.core.command.CommandDownloadLatest;
import vazkii.botania.common.core.command.CommandOpen;
import vazkii.botania.common.core.command.CommandShare;
import vazkii.botania.common.core.command.CommandSkyblockSpread;
import vazkii.botania.common.core.handler.BiomeDecorationHandler;
import vazkii.botania.common.core.handler.CommonTickHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.IMCHandler;
import vazkii.botania.common.core.handler.InternalMethodHandler;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.handler.PixieHandler;
import vazkii.botania.common.core.handler.SheddingHandler;
import vazkii.botania.common.core.loot.LootHandler;
import vazkii.botania.common.core.proxy.IProxy;
import vazkii.botania.common.crafting.ModBrewRecipes;
@@ -84,6 +77,7 @@ 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.integration.thaumcraft.TCAspects;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
@@ -92,15 +86,13 @@ import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.world.SkyblockWorldEvents;
import vazkii.botania.common.world.WorldTypeSkyblock;
import java.lang.reflect.InvocationTargetException;
@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY)
public class Botania {
public static boolean gardenOfGlassLoaded = false;
public static boolean thaumcraftLoaded = false;
public static boolean bcTriggersLoaded = false;
public static boolean bcApiLoaded = false;
public static boolean bloodMagicLoaded = false;
public static boolean coloredLightsLoaded = false;
public static boolean etFuturumLoaded = false;
@@ -118,7 +110,7 @@ public class Botania {
gardenOfGlassLoaded = Loader.isModLoaded("gardenofglass");
thaumcraftLoaded = Loader.isModLoaded("thaumcraft");
bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements");
bcApiLoaded = Loader.isModLoaded("buildcraftlib");
bloodMagicLoaded = Loader.isModLoaded("bloodmagic"); // Psh, noob
coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
etFuturumLoaded = Loader.isModLoaded("etfuturum");
@@ -173,8 +165,8 @@ public class Botania {
if(Botania.thaumcraftLoaded && ConfigHandler.enableThaumcraftAspects)
MinecraftForge.EVENT_BUS.register(TCAspects.class);
/*if(Botania.bcTriggersLoaded) todo buildcraft
new StatementAPIPlugin();*/
if(Botania.bcApiLoaded)
new StatementAPIPlugin();
proxy.init(event);
}
@@ -1,29 +1,24 @@
/*
package vazkii.botania.common.integration.buildcraft;
import java.util.ArrayList;
import java.util.Collection;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.ITriggerExternal;
import buildcraft.api.statements.ITriggerInternal;
import buildcraft.api.statements.ITriggerProvider;
import buildcraft.api.statements.StatementManager;
import buildcraft.api.statements.*;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import vazkii.botania.api.mana.IManaBlock;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.common.block.tile.TileRuneAltar;
import javax.annotation.Nonnull;
public class StatementAPIPlugin implements ITriggerProvider {
static final ITriggerExternal triggerManaEmpty = new TriggerManaLevel(TriggerManaLevel.State.EMPTY);
static final ITriggerExternal triggerManaContains = new TriggerManaLevel(TriggerManaLevel.State.CONTAINS);
static final ITriggerExternal triggerManaSpace = new TriggerManaLevel(TriggerManaLevel.State.SPACE);
static final ITriggerExternal triggerManaFull = new TriggerManaLevel(TriggerManaLevel.State.FULL);
private static final ITriggerInternal triggerManaDetector = new TriggerManaDetector();
public static final ITriggerExternal triggerManaEmpty = new TriggerManaLevel(TriggerManaLevel.State.EMPTY);
public static final ITriggerExternal triggerManaContains = new TriggerManaLevel(TriggerManaLevel.State.CONTAINS);
public static final ITriggerExternal triggerManaSpace = new TriggerManaLevel(TriggerManaLevel.State.SPACE);
public static final ITriggerExternal triggerManaFull = new TriggerManaLevel(TriggerManaLevel.State.FULL);
public static final ITriggerInternal triggerManaDetector = new TriggerManaDetector();
public static final ITriggerExternal triggerRuneAltarCanCraft = new TriggerRuneAltarCanCraft();
private static final ITriggerExternal triggerRuneAltarCanCraft = new TriggerRuneAltarCanCraft();
public StatementAPIPlugin() {
StatementManager.registerStatement(triggerManaEmpty);
@@ -38,28 +33,25 @@ public class StatementAPIPlugin implements ITriggerProvider {
}
@Override
public Collection<ITriggerInternal> getInternalTriggers(IStatementContainer container) {
ArrayList<ITriggerInternal> list = new ArrayList<>();
list.add(triggerManaDetector);
return list;
public void addInternalTriggers(Collection<ITriggerInternal> triggers, IStatementContainer container) {
triggers.add(triggerManaDetector);
}
@Override
public Collection<ITriggerExternal> getExternalTriggers(EnumFacing side, TileEntity tile) {
ArrayList<ITriggerExternal> list = new ArrayList<>();
public void addInternalSidedTriggers(Collection<ITriggerInternalSided> triggers, IStatementContainer container, @Nonnull EnumFacing side) { }
@Override
public void addExternalTriggers(Collection<ITriggerExternal> triggers, @Nonnull EnumFacing side, TileEntity tile) {
if (tile instanceof IManaBlock) {
list.add(triggerManaEmpty);
list.add(triggerManaContains);
triggers.add(triggerManaEmpty);
triggers.add(triggerManaContains);
if (tile instanceof IManaReceiver) {
list.add(triggerManaSpace);
list.add(triggerManaFull);
triggers.add(triggerManaSpace);
triggers.add(triggerManaFull);
}
}
if (tile instanceof TileRuneAltar) list.add(triggerRuneAltarCanCraft);
return list;
if (tile instanceof TileRuneAltar)
triggers.add(triggerRuneAltarCanCraft);
}
}
*/
@@ -1,18 +1,9 @@
/*
package vazkii.botania.common.integration.buildcraft;
import buildcraft.api.statements.IStatement;
import buildcraft.api.statements.IStatementParameter;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public abstract class StatementBase implements IStatement {
@Override
@SideOnly(Side.CLIENT)
public abstract TextureAtlasSprite getGuiSprite();
@Override
public int maxParameters() {
return 0;
@@ -32,5 +23,9 @@ public abstract class StatementBase implements IStatement {
public IStatement rotateLeft() {
return this;
}
@Override
public IStatement[] getPossible() {
return new IStatement[] { this };
}
}
*/
@@ -0,0 +1,32 @@
package vazkii.botania.common.integration.buildcraft;
import buildcraft.api.core.render.ISprite;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
/**
* Adapts Minecraft TAS to buildcraft ISprite
*/
public class TASprite implements ISprite {
private final TextureAtlasSprite sprite;
public TASprite(TextureAtlasSprite sprite) {
this.sprite = sprite;
}
@Override
public void bindTexture() {
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
}
@Override
public double getInterpU(double u) {
return sprite.getInterpolatedU(u * 16);
}
@Override
public double getInterpV(double v) {
return sprite.getInterpolatedV(v * 16);
}
}
@@ -1,15 +1,14 @@
/*
package vazkii.botania.common.integration.buildcraft;
import buildcraft.api.core.render.ISprite;
import com.google.common.base.Predicates;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
import buildcraft.api.statements.ITriggerInternal;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -22,18 +21,19 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getGuiSprite() {
return MiscellaneousIcons.INSTANCE.manaDetectorIcon;
public ISprite getSprite() {
return new TASprite(MiscellaneousIcons.INSTANCE.manaDetectorIcon);
}
@Override
public String getUniqueTag() {
return "botania:manaDetector";
return "botania:mana_detector";
}
@Override
@SideOnly(Side.CLIENT)
public String getDescription() {
return I18n.translateToLocal(LibTriggerNames.TRIGGER_MANA_DETECTOR);
return I18n.format(LibTriggerNames.TRIGGER_MANA_DETECTOR);
}
@Override
@@ -43,11 +43,11 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern
boolean output = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1), Predicates.instanceOf(IManaBurst.class)).size() != 0;
if(output) for(int i = 0; i < 4; i++)
Botania.proxy.sparkleFX(x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5);
if(output)
for(int i = 0; i < 4; i++)
Botania.proxy.sparkleFX(x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5);
return output;
}
}
*/
@@ -1,15 +1,15 @@
/*
package vazkii.botania.common.integration.buildcraft;
import buildcraft.api.core.render.ISprite;
import buildcraft.api.statements.IStatement;
import net.minecraft.client.resources.I18n;
import org.apache.commons.lang3.text.WordUtils;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
import buildcraft.api.statements.ITriggerExternal;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.mana.IManaBlock;
@@ -17,6 +17,8 @@ import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.client.core.handler.MiscellaneousIcons;
import vazkii.botania.common.lib.LibTriggerNames;
import java.util.Locale;
public class TriggerManaLevel extends StatementBase implements ITriggerExternal {
public enum State {
EMPTY,
@@ -33,18 +35,19 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal
@Override
public String getUniqueTag() {
return "botania:mana" + state.name();
return "botania:mana_" + state.name().toLowerCase(Locale.ROOT);
}
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getGuiSprite() {
return MiscellaneousIcons.INSTANCE.manaLevelTriggerIcons.get(state);
public ISprite getSprite() {
return new TASprite(MiscellaneousIcons.INSTANCE.manaLevelTriggerIcons.get(state));
}
@Override
@SideOnly(Side.CLIENT)
public String getDescription() {
return I18n.translateToLocal(LibTriggerNames.TRIGGER_MANA_PREFIX + WordUtils.capitalizeFully(state.name()));
return I18n.format(LibTriggerNames.TRIGGER_MANA_PREFIX + WordUtils.capitalizeFully(state.name()));
}
@Override
@@ -60,5 +63,12 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal
return false;
}
@Override
public IStatement[] getPossible() {
return new IStatement[] {
StatementAPIPlugin.triggerManaEmpty, StatementAPIPlugin.triggerManaContains,
StatementAPIPlugin.triggerManaSpace, StatementAPIPlugin.triggerManaFull
};
}
}
*/
@@ -1,13 +1,12 @@
/*
package vazkii.botania.common.integration.buildcraft;
import buildcraft.api.core.render.ISprite;
import buildcraft.api.statements.IStatementContainer;
import buildcraft.api.statements.IStatementParameter;
import buildcraft.api.statements.ITriggerExternal;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.I18n;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.client.core.handler.MiscellaneousIcons;
@@ -18,25 +17,26 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE
@Override
public String getUniqueTag() {
return "botania:runeAltarCanCraft";
return "botania:rune_altar_can_craft";
}
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getGuiSprite() {
return MiscellaneousIcons.INSTANCE.runeAltarTriggerIcon;
public ISprite getSprite() {
return new TASprite(MiscellaneousIcons.INSTANCE.runeAltarTriggerIcon);
}
@Override
@SideOnly(Side.CLIENT)
public String getDescription() {
return I18n.translateToLocal(LibTriggerNames.TRIGGER_RUNE_ALTAR_CAN_CRAFT);
return I18n.format(LibTriggerNames.TRIGGER_RUNE_ALTAR_CAN_CRAFT);
}
@Override
public boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) {
if(target instanceof TileRuneAltar) return ((TileRuneAltar) target).hasValidRecipe();
if(target instanceof TileRuneAltar)
return ((TileRuneAltar) target).hasValidRecipe();
return false;
}
}
*/
@@ -1416,7 +1416,7 @@ public final class LexiconData {
banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS))
.setIcon(new ItemStack(ModItems.lexicon));
if (Botania.bcTriggersLoaded) {
if (Botania.bcApiLoaded) {
bcIntegration = new CompatLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft");
bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.REDSTONE));
}