mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-19 03:39:15 +00:00
Cleanup, sounds for Chainsaws.
This commit is contained in:
1 parent
04b332bd07
commit
277677837e
379 files changed
+392
-1851
No files matched your search
+1
-1
@@ -3,5 +3,5 @@
|
||||
package_group=com.tombenpotter.emt
|
||||
mc_version=1.7.10
|
||||
forge_version=10.13.4.1481
|
||||
mod_version=1.2.0B1
|
||||
mod_version=1.2.0B3
|
||||
mod_name=ElectroMagicTools
|
||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
@@ -1,5 +1,8 @@
|
||||
package ic2.api;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -36,6 +39,15 @@ public enum Direction {
|
||||
*/
|
||||
ZP;
|
||||
|
||||
private Direction() {
|
||||
int side = ordinal() / 2;
|
||||
int sign = getSign();
|
||||
|
||||
xOffset = side == 0 ? sign : 0;
|
||||
yOffset = side == 1 ? sign : 0;
|
||||
zOffset = side == 2 ? sign : 0;
|
||||
}
|
||||
|
||||
public static Direction fromSideValue(int side) {
|
||||
return directions[(side + 2) % 6];
|
||||
}
|
||||
@@ -83,7 +95,7 @@ public enum Direction {
|
||||
|
||||
/**
|
||||
* Get the inverse of this direction (XN -> XP, XP -> XN, etc.)
|
||||
*
|
||||
*
|
||||
* @return Inverse direction
|
||||
*/
|
||||
public Direction getInverse() {
|
||||
@@ -92,7 +104,7 @@ public enum Direction {
|
||||
|
||||
/**
|
||||
* Convert this direction to a Minecraft side value.
|
||||
*
|
||||
*
|
||||
* @return Minecraft side value
|
||||
*/
|
||||
public int toSideValue() {
|
||||
@@ -112,6 +124,12 @@ public enum Direction {
|
||||
return ForgeDirection.getOrientation(toSideValue());
|
||||
}
|
||||
|
||||
public final int xOffset;
|
||||
public final int yOffset;
|
||||
public final int zOffset;
|
||||
|
||||
public static final Direction[] directions = Direction.values();
|
||||
public static final Set<Direction> noDirections = EnumSet.noneOf(Direction.class);
|
||||
public static final Set<Direction> allDirections = EnumSet.allOf(Direction.class);
|
||||
}
|
||||
|
||||
File renamed without changes.
File renamed without changes.
Binary file not shown.
+3
-5
@@ -263,10 +263,8 @@ public abstract class CropCard {
|
||||
*
|
||||
* @return Chance to drop the gains
|
||||
*/
|
||||
public float dropGainChance() {
|
||||
float base = 1F;
|
||||
for (int i = 0; i < tier(); i++) {base*=0.95;}
|
||||
return base;
|
||||
public float dropGainChance() { // TODO: change to double
|
||||
return (float) Math.pow(0.95, tier());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -398,7 +396,7 @@ public abstract class CropCard {
|
||||
*/
|
||||
public boolean isWeed(ICropTile crop) {
|
||||
return crop.getSize() >= 2 &&
|
||||
(crop == Crops.weed || crop.getGrowth() >= 24);
|
||||
(crop.getCrop() == Crops.weed || crop.getGrowth() >= 24);
|
||||
}
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 379 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user