Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Phase out Phaser #81

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Phase out Phaser #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
de49461
clean & tidy
Jul 17, 2021
64cf1b8
enable tick timeout, timeout investigation, and force-continuing to t…
Jul 20, 2021
8041f2b
a little bit more documentation && sanity
Jul 20, 2021
8cf94f4
mega meh
Jul 21, 2021
8acc11f
Merge branch 'master' into phase-out-phaser
Aug 14, 2021
12d64ee
move multithreading into two steps: world ticks & entity ticks
Aug 14, 2021
c969710
push changes
Aug 18, 2021
f137331
slight changes
Aug 18, 2021
15cfd4a
can't quite figure out stuck overworld tick
Aug 18, 2021
5322531
better timer
Aug 18, 2021
3bdbe46
finish it up
Aug 19, 2021
144d5e2
have SingleExecutionPool run off the main thread
meta1203 Aug 25, 2021
ddd183e
recombobulated stats command
meta1203 Aug 25, 2021
e87ce61
added a version adapter to allow use of the jar on multiple versions
meta1203 Aug 25, 2021
bd3c329
fiddle with reflections a little bit more
Aug 25, 2021
31f7109
this should work now
meta1203 Aug 25, 2021
313e758
its gross, but it works!
meta1203 Aug 25, 2021
24183bf
a version adapter is a cool concept, but probably not exactly needed …
meta1203 Aug 30, 2021
ad69052
Merge branch 'master' of https://github.com/jediminer543/JMT-MCMT int…
meta1203 Aug 30, 2021
67d4665
Merge branch 'jediminer543-master' into phase-out-phaser
meta1203 Aug 30, 2021
1fb1020
change some pool stuff to make more sense
meta1203 Aug 30, 2021
45462db
add a smidgen more logging to better nail down what might be causing …
Aug 31, 2021
484d8dd
merge from upstream - fixed
meta1203 Sep 8, 2021
42aadff
Revert "merge from upstream - fixed"
meta1203 Sep 8, 2021
bf8ad54
merge from upstream
meta1203 Sep 8, 2021
62d7793
compiles now
Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ org.gradle.daemon=false

mcmt_ver=0.22.86-pre

mappings_ver=20200723-1.16.1
mappings_chan=snapshot

# TODO: update to (func_234923_W_)
#mappings_ver=20210309-1.16.5

# 1.16.5
# 1.16.4-35.0.5
mappings_ver=20200723-1.16.1
mc_ver=1.16.5
fg_ver=36.1.2

Expand Down
13 changes: 13 additions & 0 deletions src/main/java/org/jmt/mcmt/MCMT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.jmt.mcmt;

import java.time.Instant;
import java.util.stream.Collectors;

import org.apache.logging.log4j.LogManager;
Expand Down Expand Up @@ -115,4 +116,16 @@ public static void registerEntities(RegistryEvent.Register<EntityType<?>> e) {

}
}

public static void time(Runnable r) {
Instant start = Instant.now();
r.run();
LOGGER.info("Task finished, took " + Instant.now().minusMillis(start.toEpochMilli()).toEpochMilli() + " ms.");
}

public static void time(Runnable r, String taskName) {
Instant start = Instant.now();
r.run();
LOGGER.info(taskName + " finished in " + Instant.now().minusMillis(start.toEpochMilli()).toEpochMilli() + " ms.");
}
}