Comment out psi support and remove jar

This commit is contained in:
modmuss50 2016-05-08 09:53:48 +01:00
parent 063558bf71
commit 4c6c88d950
4 changed files with 156 additions and 157 deletions

Binary file not shown.

View file

@ -7,7 +7,6 @@ import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import techreborn.client.render.parts.ClientPartLoader; import techreborn.client.render.parts.ClientPartLoader;
import techreborn.compat.minetweaker.MinetweakerCompat; import techreborn.compat.minetweaker.MinetweakerCompat;
import techreborn.compat.psi.CompatModulePsi;
import techreborn.compat.waila.CompatModuleWaila; import techreborn.compat.waila.CompatModuleWaila;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.parts.StandalonePartCompact; import techreborn.parts.StandalonePartCompact;

View file

@ -1,54 +1,54 @@
package techreborn.compat.psi; //package techreborn.compat.psi;
//
import net.minecraftforge.fml.common.event.FMLInitializationEvent; //import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; //import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; //import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent; //import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule; //import techreborn.compat.ICompatModule;
import techreborn.compat.psi.spell.trick.block.PieceTrickBlockTap; //import techreborn.compat.psi.spell.trick.block.PieceTrickBlockTap;
import vazkii.psi.api.PsiAPI; //import vazkii.psi.api.PsiAPI;
import vazkii.psi.api.spell.Spell; //import vazkii.psi.api.spell.Spell;
import vazkii.psi.api.spell.SpellPiece; //import vazkii.psi.api.spell.SpellPiece;
import vazkii.psi.common.lib.LibPieceGroups; //import vazkii.psi.common.lib.LibPieceGroups;
//
public class CompatModulePsi implements ICompatModule { //public class CompatModulePsi implements ICompatModule {
public static PieceContainer trickTreetap; // public static PieceContainer trickTreetap;
public static final String TRICK_TAP_BLOCK = "trickTapBlock"; // public static final String TRICK_TAP_BLOCK = "trickTapBlock";
//
@Override // @Override
public void preInit(FMLPreInitializationEvent event) { // public void preInit(FMLPreInitializationEvent event) {
trickTreetap = register(PieceTrickBlockTap.class, TRICK_TAP_BLOCK, LibPieceGroups.BLOCK_WORKS); // trickTreetap = register(PieceTrickBlockTap.class, TRICK_TAP_BLOCK, LibPieceGroups.BLOCK_WORKS);
} // }
//
@Override // @Override
public void init(FMLInitializationEvent event) { // public void init(FMLInitializationEvent event) {
//
} // }
//
@Override // @Override
public void postInit(FMLPostInitializationEvent event) { // public void postInit(FMLPostInitializationEvent event) {
//
} // }
//
@Override // @Override
public void serverStarting(FMLServerStartingEvent event) { // public void serverStarting(FMLServerStartingEvent event) {
//
} // }
//
public static PieceContainer register(Class<? extends SpellPiece> clazz, String name, String group) { // public static PieceContainer register(Class<? extends SpellPiece> clazz, String name, String group) {
return register(clazz, name, group, false); // return register(clazz, name, group, false);
} // }
//
public static PieceContainer register(Class<? extends SpellPiece> clazz, String name, String group, boolean main) { // public static PieceContainer register(Class<? extends SpellPiece> clazz, String name, String group, boolean main) {
PsiAPI.registerSpellPieceAndTexture(name, clazz); // PsiAPI.registerSpellPieceAndTexture(name, clazz);
PsiAPI.addPieceToGroup(clazz, group, main); // PsiAPI.addPieceToGroup(clazz, group, main);
return (Spell s) -> { // return (Spell s) -> {
return SpellPiece.create(clazz, s); // return SpellPiece.create(clazz, s);
}; // };
} // }
//
public static interface PieceContainer { // public static interface PieceContainer {
public SpellPiece get(Spell s); // public SpellPiece get(Spell s);
} // }
//
} //}

View file

@ -1,102 +1,102 @@
package techreborn.compat.psi.spell.trick.block; //package techreborn.compat.psi.spell.trick.block;
//
import java.util.Random; //import java.util.Random;
//
import net.minecraft.block.state.IBlockState; //import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem; //import net.minecraft.entity.item.EntityItem;
import net.minecraft.util.EnumFacing; //import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; //import net.minecraft.util.math.BlockPos;
import techreborn.blocks.BlockRubberLog; //import techreborn.blocks.BlockRubberLog;
import techreborn.items.ItemParts; //import techreborn.items.ItemParts;
import vazkii.psi.api.internal.Vector3; //import vazkii.psi.api.internal.Vector3;
import vazkii.psi.api.spell.EnumSpellStat; //import vazkii.psi.api.spell.EnumSpellStat;
import vazkii.psi.api.spell.Spell; //import vazkii.psi.api.spell.Spell;
import vazkii.psi.api.spell.SpellCompilationException; //import vazkii.psi.api.spell.SpellCompilationException;
import vazkii.psi.api.spell.SpellContext; //import vazkii.psi.api.spell.SpellContext;
import vazkii.psi.api.spell.SpellMetadata; //import vazkii.psi.api.spell.SpellMetadata;
import vazkii.psi.api.spell.SpellParam; //import vazkii.psi.api.spell.SpellParam;
import vazkii.psi.api.spell.SpellRuntimeException; //import vazkii.psi.api.spell.SpellRuntimeException;
import vazkii.psi.api.spell.param.ParamVector; //import vazkii.psi.api.spell.param.ParamVector;
import vazkii.psi.api.spell.piece.PieceTrick; //import vazkii.psi.api.spell.piece.PieceTrick;
//
public class PieceTrickBlockTap extends PieceTrick { //public class PieceTrickBlockTap extends PieceTrick {
//
SpellParam position; // SpellParam position;
SpellParam side; // SpellParam side;
//
public PieceTrickBlockTap(Spell spell) { // public PieceTrickBlockTap(Spell spell) {
super(spell); // super(spell);
} // }
//
@Override // @Override
public void initParams() { // public void initParams() {
addParam(position = new ParamVector(SpellParam.GENERIC_NAME_POSITION, SpellParam.BLUE, false, false)); // addParam(position = new ParamVector(SpellParam.GENERIC_NAME_POSITION, SpellParam.BLUE, false, false));
addParam(side = new ParamVector("Side", SpellParam.GREEN, false, false)); // addParam(side = new ParamVector("Side", SpellParam.GREEN, false, false));
} // }
//
@Override // @Override
public void addToMetadata(SpellMetadata meta) throws SpellCompilationException { // public void addToMetadata(SpellMetadata meta) throws SpellCompilationException {
super.addToMetadata(meta); // super.addToMetadata(meta);
//
meta.addStat(EnumSpellStat.POTENCY, 20); // meta.addStat(EnumSpellStat.POTENCY, 20);
meta.addStat(EnumSpellStat.COST, 25); // meta.addStat(EnumSpellStat.COST, 25);
} // }
//
@Override // @Override
public Object execute(SpellContext context) throws SpellRuntimeException { // public Object execute(SpellContext context) throws SpellRuntimeException {
if (context.caster.worldObj.isRemote) // if (context.caster.worldObj.isRemote)
return null; // return null;
//
Vector3 positionVal = this.<Vector3> getParamValue(context, position); // Vector3 positionVal = this.<Vector3> getParamValue(context, position);
Vector3 sideVal = this.<Vector3> getParamValue(context, side); // Vector3 sideVal = this.<Vector3> getParamValue(context, side);
//
if (positionVal == null) // if (positionVal == null)
throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); // throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR);
if (!context.isInRadius(positionVal)) // if (!context.isInRadius(positionVal))
throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); // throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS);
//
if (sideVal == null) // if (sideVal == null)
throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); // throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR);
if (!context.isInRadius(sideVal)) // if (!context.isInRadius(sideVal))
throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); // throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS);
//
if(!sideVal.isAxial()){ // if(!sideVal.isAxial()){
return null; // return null;
} // }
//
BlockPos pos = new BlockPos(positionVal.x, positionVal.y, positionVal.z); // BlockPos pos = new BlockPos(positionVal.x, positionVal.y, positionVal.z);
IBlockState state = context.caster.worldObj.getBlockState(pos); // IBlockState state = context.caster.worldObj.getBlockState(pos);
if (state.getBlock() instanceof BlockRubberLog) { // if (state.getBlock() instanceof BlockRubberLog) {
System.out.println("Is rubber log"); // System.out.println("Is rubber log");
if (state.getValue(BlockRubberLog.HAS_SAP)) { // if (state.getValue(BlockRubberLog.HAS_SAP)) {
System.out.println("Has sap"); // System.out.println("Has sap");
if (state.getValue(BlockRubberLog.SAP_SIDE) == null) { // if (state.getValue(BlockRubberLog.SAP_SIDE) == null) {
System.out.println("got this far"); // System.out.println("got this far");
context.caster.worldObj.setBlockState(pos, state.withProperty(BlockRubberLog.HAS_SAP, false) // context.caster.worldObj.setBlockState(pos, state.withProperty(BlockRubberLog.HAS_SAP, false)
.withProperty(BlockRubberLog.SAP_SIDE, EnumFacing.getHorizontal(0))); // .withProperty(BlockRubberLog.SAP_SIDE, EnumFacing.getHorizontal(0)));
// TODO 1.9 sounds // // TODO 1.9 sounds
// worldIn.playSoundAtEntity(playerIn, // // worldIn.playSoundAtEntity(playerIn,
// "techreborn:sap_extract", 0.8F, 1F); // // "techreborn:sap_extract", 0.8F, 1F);
if (!context.caster.worldObj.isRemote) { // if (!context.caster.worldObj.isRemote) {
System.out.println("doing stuff"); // System.out.println("doing stuff");
Random rand = new Random(); // Random rand = new Random();
BlockPos itemPos = pos.offset(context.positionBroken.sideHit); // BlockPos itemPos = pos.offset(context.positionBroken.sideHit);
EntityItem item = new EntityItem(context.caster.worldObj, itemPos.getX(), itemPos.getY(), // EntityItem item = new EntityItem(context.caster.worldObj, itemPos.getX(), itemPos.getY(),
itemPos.getZ(), ItemParts.getPartByName("rubberSap").copy()); // itemPos.getZ(), ItemParts.getPartByName("rubberSap").copy());
float factor = 0.05F; // float factor = 0.05F;
item.motionX = rand.nextGaussian() * factor; // item.motionX = rand.nextGaussian() * factor;
item.motionY = rand.nextGaussian() * factor + 0.2F; // item.motionY = rand.nextGaussian() * factor + 0.2F;
item.motionZ = rand.nextGaussian() * factor; // item.motionZ = rand.nextGaussian() * factor;
context.caster.worldObj.spawnEntityInWorld(item); // context.caster.worldObj.spawnEntityInWorld(item);
} // }
} else { // } else {
return null; // return null;
} // }
} else { // } else {
return null; // return null;
} // }
} // }
return null; // return null;
//
} // }
} //}