lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up a lot of different inspections

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-01 19:27:38 -08:00
parent 0dd0854bd9
commit 70d98455b7
207 changed files with 603 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

@ -3,10 +3,8 @@ package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.item.ItemSigil;
import WayofTime.bloodmagic.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@ -55,7 +53,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider {
@Override
public List<Pair<Integer, String>> getVariants() {
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
List<Pair<Integer, String>> ret = new ArrayList<>();
ret.add(Pair.of(0, "type=normal"));
return ret;
}

13
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
View file

@ -12,9 +12,10 @@ import java.util.HashMap;
import java.util.Map;
public class ItemSigilPhantomBridge extends ItemSigilToggleableBase {
private Map<EntityPlayer, Pair<Double, Double>> prevPositionMap = new HashMap<EntityPlayer, Pair<Double, Double>>();
private double expansionFactor = 2;
private int range = 3;
private static final double EXPANSION_FACTOR = 2;
private static final int RANGE = 3;
private Map<EntityPlayer, Pair<Double, Double>> prevPositionMap = new HashMap<>();
public ItemSigilPhantomBridge() {
super("phantom_bridge", 100);
@ -57,12 +58,12 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase {
int posY = playerPos.getY();
int posZ = playerPos.getZ();
double offsetPosX = posX + expansionFactor * playerVelX;
double offsetPosZ = posZ + expansionFactor * playerVelZ;
double offsetPosX = posX + EXPANSION_FACTOR * playerVelX;
double offsetPosZ = posZ + EXPANSION_FACTOR * playerVelZ;
double avgX = (posX + offsetPosX) / 2;
double avgZ = (posZ + offsetPosZ) / 2;
double C = 2 * (range + expansionFactor * totalVel) + 1;
double C = 2 * (RANGE + EXPANSION_FACTOR * totalVel) + 1;
int truncC = (int) C;
//TODO: Make this for-loop better.

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
View file

@ -3,11 +3,9 @@ package WayofTime.bloodmagic.item.sigil;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.item.ItemSigilToggleable;
import WayofTime.bloodmagic.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
@ -64,7 +62,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
@Override
public List<String> getVariants() {
List<String> ret = new ArrayList<String>();
List<String> ret = new ArrayList<>();
ret.add("active=false");
ret.add("active=true");