diff --git a/libs/Psi-beta-32-deobf.jar b/libs/Psi-beta-32-deobf.jar deleted file mode 100644 index df12e8e7e..000000000 Binary files a/libs/Psi-beta-32-deobf.jar and /dev/null differ diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 4242b8b69..8e58616b4 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -7,7 +7,6 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import techreborn.client.render.parts.ClientPartLoader; import techreborn.compat.minetweaker.MinetweakerCompat; -import techreborn.compat.psi.CompatModulePsi; import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; diff --git a/src/main/java/techreborn/compat/psi/CompatModulePsi.java b/src/main/java/techreborn/compat/psi/CompatModulePsi.java index 962f53d83..b4a6e6ac6 100644 --- a/src/main/java/techreborn/compat/psi/CompatModulePsi.java +++ b/src/main/java/techreborn/compat/psi/CompatModulePsi.java @@ -1,54 +1,54 @@ -package techreborn.compat.psi; - -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import techreborn.compat.ICompatModule; -import techreborn.compat.psi.spell.trick.block.PieceTrickBlockTap; -import vazkii.psi.api.PsiAPI; -import vazkii.psi.api.spell.Spell; -import vazkii.psi.api.spell.SpellPiece; -import vazkii.psi.common.lib.LibPieceGroups; - -public class CompatModulePsi implements ICompatModule { - public static PieceContainer trickTreetap; - public static final String TRICK_TAP_BLOCK = "trickTapBlock"; - - @Override - public void preInit(FMLPreInitializationEvent event) { - trickTreetap = register(PieceTrickBlockTap.class, TRICK_TAP_BLOCK, LibPieceGroups.BLOCK_WORKS); - } - - @Override - public void init(FMLInitializationEvent event) { - - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - - } - - @Override - public void serverStarting(FMLServerStartingEvent event) { - - } - - public static PieceContainer register(Class clazz, String name, String group) { - return register(clazz, name, group, false); - } - - public static PieceContainer register(Class clazz, String name, String group, boolean main) { - PsiAPI.registerSpellPieceAndTexture(name, clazz); - PsiAPI.addPieceToGroup(clazz, group, main); - return (Spell s) -> { - return SpellPiece.create(clazz, s); - }; - } - - public static interface PieceContainer { - public SpellPiece get(Spell s); - } - -} +//package techreborn.compat.psi; +// +//import net.minecraftforge.fml.common.event.FMLInitializationEvent; +//import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +//import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +//import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +//import techreborn.compat.ICompatModule; +//import techreborn.compat.psi.spell.trick.block.PieceTrickBlockTap; +//import vazkii.psi.api.PsiAPI; +//import vazkii.psi.api.spell.Spell; +//import vazkii.psi.api.spell.SpellPiece; +//import vazkii.psi.common.lib.LibPieceGroups; +// +//public class CompatModulePsi implements ICompatModule { +// public static PieceContainer trickTreetap; +// public static final String TRICK_TAP_BLOCK = "trickTapBlock"; +// +// @Override +// public void preInit(FMLPreInitializationEvent event) { +// trickTreetap = register(PieceTrickBlockTap.class, TRICK_TAP_BLOCK, LibPieceGroups.BLOCK_WORKS); +// } +// +// @Override +// public void init(FMLInitializationEvent event) { +// +// } +// +// @Override +// public void postInit(FMLPostInitializationEvent event) { +// +// } +// +// @Override +// public void serverStarting(FMLServerStartingEvent event) { +// +// } +// +// public static PieceContainer register(Class clazz, String name, String group) { +// return register(clazz, name, group, false); +// } +// +// public static PieceContainer register(Class clazz, String name, String group, boolean main) { +// PsiAPI.registerSpellPieceAndTexture(name, clazz); +// PsiAPI.addPieceToGroup(clazz, group, main); +// return (Spell s) -> { +// return SpellPiece.create(clazz, s); +// }; +// } +// +// public static interface PieceContainer { +// public SpellPiece get(Spell s); +// } +// +//} diff --git a/src/main/java/techreborn/compat/psi/spell/trick/block/PieceTrickBlockTap.java b/src/main/java/techreborn/compat/psi/spell/trick/block/PieceTrickBlockTap.java index 9628523a7..52049c65a 100644 --- a/src/main/java/techreborn/compat/psi/spell/trick/block/PieceTrickBlockTap.java +++ b/src/main/java/techreborn/compat/psi/spell/trick/block/PieceTrickBlockTap.java @@ -1,102 +1,102 @@ -package techreborn.compat.psi.spell.trick.block; - -import java.util.Random; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import techreborn.blocks.BlockRubberLog; -import techreborn.items.ItemParts; -import vazkii.psi.api.internal.Vector3; -import vazkii.psi.api.spell.EnumSpellStat; -import vazkii.psi.api.spell.Spell; -import vazkii.psi.api.spell.SpellCompilationException; -import vazkii.psi.api.spell.SpellContext; -import vazkii.psi.api.spell.SpellMetadata; -import vazkii.psi.api.spell.SpellParam; -import vazkii.psi.api.spell.SpellRuntimeException; -import vazkii.psi.api.spell.param.ParamVector; -import vazkii.psi.api.spell.piece.PieceTrick; - -public class PieceTrickBlockTap extends PieceTrick { - - SpellParam position; - SpellParam side; - - public PieceTrickBlockTap(Spell spell) { - super(spell); - } - - @Override - public void initParams() { - addParam(position = new ParamVector(SpellParam.GENERIC_NAME_POSITION, SpellParam.BLUE, false, false)); - addParam(side = new ParamVector("Side", SpellParam.GREEN, false, false)); - } - - @Override - public void addToMetadata(SpellMetadata meta) throws SpellCompilationException { - super.addToMetadata(meta); - - meta.addStat(EnumSpellStat.POTENCY, 20); - meta.addStat(EnumSpellStat.COST, 25); - } - - @Override - public Object execute(SpellContext context) throws SpellRuntimeException { - if (context.caster.worldObj.isRemote) - return null; - - Vector3 positionVal = this. getParamValue(context, position); - Vector3 sideVal = this. getParamValue(context, side); - - if (positionVal == null) - throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); - if (!context.isInRadius(positionVal)) - throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); - - if (sideVal == null) - throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); - if (!context.isInRadius(sideVal)) - throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); - - if(!sideVal.isAxial()){ - return null; - } - - BlockPos pos = new BlockPos(positionVal.x, positionVal.y, positionVal.z); - IBlockState state = context.caster.worldObj.getBlockState(pos); - if (state.getBlock() instanceof BlockRubberLog) { - System.out.println("Is rubber log"); - if (state.getValue(BlockRubberLog.HAS_SAP)) { - System.out.println("Has sap"); - if (state.getValue(BlockRubberLog.SAP_SIDE) == null) { - System.out.println("got this far"); - context.caster.worldObj.setBlockState(pos, state.withProperty(BlockRubberLog.HAS_SAP, false) - .withProperty(BlockRubberLog.SAP_SIDE, EnumFacing.getHorizontal(0))); - // TODO 1.9 sounds - // worldIn.playSoundAtEntity(playerIn, - // "techreborn:sap_extract", 0.8F, 1F); - if (!context.caster.worldObj.isRemote) { - System.out.println("doing stuff"); - Random rand = new Random(); - BlockPos itemPos = pos.offset(context.positionBroken.sideHit); - EntityItem item = new EntityItem(context.caster.worldObj, itemPos.getX(), itemPos.getY(), - itemPos.getZ(), ItemParts.getPartByName("rubberSap").copy()); - float factor = 0.05F; - item.motionX = rand.nextGaussian() * factor; - item.motionY = rand.nextGaussian() * factor + 0.2F; - item.motionZ = rand.nextGaussian() * factor; - context.caster.worldObj.spawnEntityInWorld(item); - } - } else { - return null; - } - } else { - return null; - } - } - return null; - - } -} +//package techreborn.compat.psi.spell.trick.block; +// +//import java.util.Random; +// +//import net.minecraft.block.state.IBlockState; +//import net.minecraft.entity.item.EntityItem; +//import net.minecraft.util.EnumFacing; +//import net.minecraft.util.math.BlockPos; +//import techreborn.blocks.BlockRubberLog; +//import techreborn.items.ItemParts; +//import vazkii.psi.api.internal.Vector3; +//import vazkii.psi.api.spell.EnumSpellStat; +//import vazkii.psi.api.spell.Spell; +//import vazkii.psi.api.spell.SpellCompilationException; +//import vazkii.psi.api.spell.SpellContext; +//import vazkii.psi.api.spell.SpellMetadata; +//import vazkii.psi.api.spell.SpellParam; +//import vazkii.psi.api.spell.SpellRuntimeException; +//import vazkii.psi.api.spell.param.ParamVector; +//import vazkii.psi.api.spell.piece.PieceTrick; +// +//public class PieceTrickBlockTap extends PieceTrick { +// +// SpellParam position; +// SpellParam side; +// +// public PieceTrickBlockTap(Spell spell) { +// super(spell); +// } +// +// @Override +// public void initParams() { +// addParam(position = new ParamVector(SpellParam.GENERIC_NAME_POSITION, SpellParam.BLUE, false, false)); +// addParam(side = new ParamVector("Side", SpellParam.GREEN, false, false)); +// } +// +// @Override +// public void addToMetadata(SpellMetadata meta) throws SpellCompilationException { +// super.addToMetadata(meta); +// +// meta.addStat(EnumSpellStat.POTENCY, 20); +// meta.addStat(EnumSpellStat.COST, 25); +// } +// +// @Override +// public Object execute(SpellContext context) throws SpellRuntimeException { +// if (context.caster.worldObj.isRemote) +// return null; +// +// Vector3 positionVal = this. getParamValue(context, position); +// Vector3 sideVal = this. getParamValue(context, side); +// +// if (positionVal == null) +// throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); +// if (!context.isInRadius(positionVal)) +// throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); +// +// if (sideVal == null) +// throw new SpellRuntimeException(SpellRuntimeException.NULL_VECTOR); +// if (!context.isInRadius(sideVal)) +// throw new SpellRuntimeException(SpellRuntimeException.OUTSIDE_RADIUS); +// +// if(!sideVal.isAxial()){ +// return null; +// } +// +// BlockPos pos = new BlockPos(positionVal.x, positionVal.y, positionVal.z); +// IBlockState state = context.caster.worldObj.getBlockState(pos); +// if (state.getBlock() instanceof BlockRubberLog) { +// System.out.println("Is rubber log"); +// if (state.getValue(BlockRubberLog.HAS_SAP)) { +// System.out.println("Has sap"); +// if (state.getValue(BlockRubberLog.SAP_SIDE) == null) { +// System.out.println("got this far"); +// context.caster.worldObj.setBlockState(pos, state.withProperty(BlockRubberLog.HAS_SAP, false) +// .withProperty(BlockRubberLog.SAP_SIDE, EnumFacing.getHorizontal(0))); +// // TODO 1.9 sounds +// // worldIn.playSoundAtEntity(playerIn, +// // "techreborn:sap_extract", 0.8F, 1F); +// if (!context.caster.worldObj.isRemote) { +// System.out.println("doing stuff"); +// Random rand = new Random(); +// BlockPos itemPos = pos.offset(context.positionBroken.sideHit); +// EntityItem item = new EntityItem(context.caster.worldObj, itemPos.getX(), itemPos.getY(), +// itemPos.getZ(), ItemParts.getPartByName("rubberSap").copy()); +// float factor = 0.05F; +// item.motionX = rand.nextGaussian() * factor; +// item.motionY = rand.nextGaussian() * factor + 0.2F; +// item.motionZ = rand.nextGaussian() * factor; +// context.caster.worldObj.spawnEntityInWorld(item); +// } +// } else { +// return null; +// } +// } else { +// return null; +// } +// } +// return null; +// +// } +//}