Fast-forward master to working and delete working #1

Merged
AMNatty merged 29 commits from working into master 2022-04-06 09:04:32 +00:00
3 changed files with 4 additions and 18 deletions
Showing only changes of commit c5869e536b - Show all commits

View File

@ -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
@ -56,9 +57,9 @@ Awaiting implementation:
* `[PlutoLib]` Deprecated `TPL#load(String)` in favor of `TPL#load(ResourceAddress)`, * `[PlutoLib]` Deprecated `TPL#load(String)` in favor of `TPL#load(ResourceAddress)`,
`TPL#load(File)` and `TPL#load(Path)` `TPL#load(File)` and `TPL#load(Path)`
* `[PlutoTexturing]` Deprecated the `String` variant of `Texture#load` * `[PlutoTexturing]` Deprecated the `String` variant of `Texture#load`
to reflect this change to reflect this change
* `[PlutoSpritesheet]` Removed the usage of this method * `[PlutoSpritesheet]` Removed the usage of this method
in `DisposablePlaceholderSprite` in `DisposablePlaceholderSprite`
* `[PlutoLib]` Added an option to flip loaded images with `TPL#loadImageSpecial` * `[PlutoLib]` Added an option to flip loaded images with `TPL#loadImageSpecial`
and added respective `TPL#loadSpecial` for every `TPL#load` and added respective `TPL#loadSpecial` for every `TPL#load`
* `[PlutoLib]` *Removed* `TPJImage` * `[PlutoLib]` *Removed* `TPJImage`

View File

@ -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;

View File

@ -1,10 +0,0 @@
package cz.tefek.pluto.event;
/**
* @author 493msi
*
*/
public class EventData
{
}