Fast-forward master to working and delete working #1
|
@ -3,6 +3,7 @@
|
||||||
* `[PlutoLib]` *Removed* `TextIn`, `TextOut`, `ResourceImage` and `ResourceInputStream`
|
* `[PlutoLib]` *Removed* `TextIn`, `TextOut`, `ResourceImage` and `ResourceInputStream`
|
||||||
* `[PlutoLib]` *Removed* `StaticPlutoEventManager` as the implementation was too obscure
|
* `[PlutoLib]` *Removed* `StaticPlutoEventManager` as the implementation was too obscure
|
||||||
* The module system now uses its own event management
|
* The module system now uses its own event management
|
||||||
|
* *Removed* the `EventData` class
|
||||||
* `[PlutoLib]` Made `OutputSplitStream` public as it is now reusable
|
* `[PlutoLib]` Made `OutputSplitStream` public as it is now reusable
|
||||||
* `[PlutoLib]` Added the `@ConstantExpression` annotation
|
* `[PlutoLib]` Added the `@ConstantExpression` annotation
|
||||||
* `[PlutoLib]` The `RAID#getIDOf` method now returns `OptionalInt` to avoid NPEs
|
* `[PlutoLib]` The `RAID#getIDOf` method now returns `OptionalInt` to avoid NPEs
|
||||||
|
|
|
@ -45,11 +45,6 @@ public class MiniTime
|
||||||
{
|
{
|
||||||
private static class MiniTimeParseException extends RuntimeException
|
private static class MiniTimeParseException extends RuntimeException
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
private static final long serialVersionUID = -5403949842120041373L;
|
|
||||||
|
|
||||||
public MiniTimeParseException()
|
public MiniTimeParseException()
|
||||||
{
|
{
|
||||||
super("Time period could not be parsed. Correct format: \\_w\\_d\\_h\\_m\\_s **without spaces** between the units. You can skip a time unit. Example: 1h15m");
|
super("Time period could not be parsed. Correct format: \\_w\\_d\\_h\\_m\\_s **without spaces** between the units. You can skip a time unit. Example: 1h15m");
|
||||||
|
@ -189,7 +184,7 @@ public class MiniTime
|
||||||
throw new MiniTimeParseException();
|
throw new MiniTimeParseException();
|
||||||
}
|
}
|
||||||
|
|
||||||
time += multiplier * number;
|
time += (long) multiplier * number;
|
||||||
}
|
}
|
||||||
|
|
||||||
return System.currentTimeMillis() + time;
|
return System.currentTimeMillis() + time;
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
package cz.tefek.pluto.event;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author 493msi
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class EventData
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue