Commit Graph

941 Commits

Author SHA1 Message Date
Octavia Togami
3e07a99241
Merge branch 'master' into feature/sponge-schematic-3 2022-01-23 11:52:15 -08:00
JOO200
757bef1f7d
Fix for #1983, Use Math.floor instead of int cast (master branch) (#1989) 2021-12-29 14:58:56 +10:00
Octavia Togami
c554d7572e
Refactor the selector choice enum to be cleaner
Fix gradle checks
2021-12-23 21:09:30 +10:00
Madeline Miller
6c20cf21c1
Add a //pos command to set multiple positions at once
pre-emptively fix what octy is definitely going to pull me up on in the review

Rename pos2Extra to pos2

Fixex extra line

Apply suggestions from code review

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>

Directly use pos2 as a list

Add an -s arg to set the selector type

Update pos1 text
2021-12-23 21:09:27 +10:00
Madeline Miller
98c93d011b
Merge remote-tracking branch 'origin/version/7.2.x' into chore/merging-to-master 2021-12-21 20:16:52 +10:00
Madeline Miller
d0ecd8da78
Merge 1.18.1 to master 2021-12-21 20:09:55 +10:00
Brokkonaut
9843a4feb3
Fix snapshots in 1.18 (#1959)
* Fix snapshots in 1.18

* use Int2ObjectOpenHashMap

* Fix loading zipped snapshots that contain an entities folder

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-12-14 17:32:39 +00:00
Octavia Togami
6df194e569
Remove finalize, use a Cleaner instead (#1943)
* Remove finalize, use a Cleaner instead

* Enable tracing by default

* License fix

* Use the more correct extent
2021-12-14 04:08:45 +00:00
wizjany
20c42b51c8
Extract log4j version to Versions.kt.
Also bump to match underlying platform versions to resolve runtime
version mismatches.
2021-12-12 18:49:32 -05:00
wizjany
5ce37d7ab2
Merge branch 'version/7.2.x' into snapshot-testing/1.18 2021-12-02 15:15:05 -05:00
wizjany
f53282715e Remove height from //expand vert.
With new world height limits, this will cause more confusion than good.
`//outset -v` or `//expand u,d` can replicate the previous behavior.
2021-11-30 22:19:14 -05:00
wizjany
f534b61f30 Theoretically works on forge. 2021-11-30 16:01:06 -05:00
Octavia Togami
29f1c66157
If a trace hits the world limit, cancel it (#1942) 2021-11-21 02:13:45 +00:00
Lilly Tempest
de6fa17b01
Add getBrush helper for use with instanceof pattern matching (#1926)
Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-11-21 02:02:59 +00:00
Octavia Togami
09bdf0a629
Merge branch 'version/7.2.x'
Oh god this was so awful
2021-11-20 17:23:24 -08:00
wizjany
c4074717b3
Re-add class shutter with tweaks. (#1947)
We want to hide default-package classes, such as "com", "io", etc. which are common names
in Mojang obf classes but also common package names, without hiding generated default-package
classes such as described in #1895.

This reverts commit 6008fe73
2021-11-19 19:47:21 +00:00
Octavia Togami
21e65e3958
Update Kotlin version so it builds 2021-11-18 22:12:45 -08:00
Octavia Togami
53559192b4
Fix the build a bit
Improved checkstyling
2021-11-14 00:15:22 -08:00
wizjany
d48530cb67
Don't allow editing without a Bukkit Impl Adapter. (#1920)
* Don't allow editing without a Bukkit Impl Adapter.

Also fix up some failed adapter checks.

* Make config a string, log warning message.

* checkstyle
2021-10-23 16:42:14 -07:00
Octavia Togami
6008fe7333
Remove class shutter
Runtime classes are no longer conflicting. Fixes #1895.
2021-09-12 16:01:25 -07:00
Maddy Miller
fbf61ef9e8
Fix raise and lower deform brushes (#1889) 2021-09-10 23:10:09 -07:00
Madeline Miller
f1350111ca Merge remote-tracking branch 'origin/version/7.2.x' 2021-09-05 20:16:54 +10:00
Maddy Miller
b1c230d36a
Add conditional checking in help command (#1888) 2021-09-04 12:06:15 +10:00
Madeline Miller
81f98b7b96 Merge branch 'version/7.2.x' 2021-08-22 14:36:57 +10:00
Madeline Miller
f049d5613f Revert "Use a Guava Cache instead of a ThreadLocal (#1859)"
This reverts commit b9f0416624.
2021-08-22 13:45:33 +10:00
Octavia Togami
ed28089628
Don't crash if fields are null in ChunkDeleter (#1874)
Fixes #1873
2021-08-22 13:27:25 +10:00
Maddy Miller
c5a4450373
Internally use a negated mask class to prevent russian doll wrapping (#1877) 2021-08-21 15:45:57 +10:00
JOO200
1397ec769f
Add Snow Smooth Tools (#1580)
* Added Snow Smooth Tools

* Added missing javadocs

* Restore backwards compatibility

* Use isAir and isLiquid instead of checking exact types

* Changed message for smoothing snow

* Use IntegerProperty instead of Property<Object>

* Requested changes from review

* Added missing ":", consistent command description

* Drop unnecessary try-catch for snow layer property

* Removed configuration arguments for gaussian kernel

* Removed duplicated code fragments to calculate the heightmap

* Fixed switched x and y coordinates

* Added missing point for checkstyle

* Changed command usage as requested

* Reordered flag for //snowsmooth, nicer formatting

Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-08-19 12:55:50 -07:00
Madeline Miller
9de6b87948 Bump language files 2021-08-16 17:30:32 +10:00
Madeline Miller
515863da1f Merge branch 'version/7.2.x' 2021-08-09 20:17:59 +10:00
Maddy Miller
4277cb5239
Use MethodHandle for faster event bus (#1865)
* Use MethodHandle for faster event bus

* Implement hashCode/equals

* Apply review comments

* Bind to the object directly
2021-08-09 19:06:00 +10:00
Maddy Miller
8ee45137aa
Fix Cycler tool not using full block data (#1868) 2021-08-08 08:23:44 -07:00
Octavia Togami
b9f0416624
Use a Guava Cache instead of a ThreadLocal (#1862)
This allows high performance without leaking memory, and works around
the JVM bug with ThreadLocals. See #1722.
2021-08-02 10:21:13 -07:00
Octavia Togami
2e45a20348
[Forge] Update to 1.17.1 (#1847)
* [Forge] Update to 1.17.1

Includes minor updates to Fabric as well.

water and water and water water

* Fix a few things

* Move to latest versions of FG/Forge

Also drops TrueZIP in dev
2021-07-28 23:01:35 -07:00
Matthew Miller
f414af50f6
Fix the offset mask forcing negation of itself (#1656) 2021-07-20 18:50:12 -07:00
Madeline Miller
a383d9164a Merge branch 'version/7.2.x' 2021-07-18 16:06:48 +10:00
Matt
fb1fb84965 Fixed typo and grammar 2021-07-16 11:31:35 -07:00
Maddy Miller
8b38f6fbc0
Support 48x48x48 drawsel on 1.16+ (#1826)
* Support 48x48x48 drawsel on 1.16+

* Also update the chat message on //drawsel

* Extract the code

* Split the x/y/z

* angry reacts only
2021-07-16 20:14:46 +10:00
Matt
27baceca85 Fixed typo 2021-07-15 21:33:17 -07:00
Octavia Togami
2f6b50a427
Update for final changes 2021-07-14 21:49:55 -07:00
Octavia Togami
e1892b7bd4
Fix imports 2021-07-14 21:49:55 -07:00
Octavia Togami
a5ce8a4765
Licenses lol 2021-07-14 21:49:55 -07:00
Octavia Togami
bd475b1d4a
Update to Sponge Schematic 3
Includes a major refactoring of how schematics are read.
2021-07-14 21:49:54 -07:00
Octavia Togami
76a30080c5
Merge branch 'version/7.2.x' into feature/117-for-master 2021-07-14 13:36:14 -07:00
wizjany
5a143b83b2
Fix setting biomes on negative-Y-enabled worlds. (#1833)
Also left a note for forge, again.

Closes #1819.
2021-07-14 13:34:50 -07:00
NotMyFault
9c7f4542a2
Fix a couple of typos (#1835)
* Fix typo in BukkitImplAdapter

* Yet another dangling typo
2021-07-14 08:08:34 -07:00
Octavia Togami
8a830814df
Merge branch 'version/7.2.x' 2021-07-13 14:38:26 -07:00
Maddy Miller
954210deb8
Fix //outline for non-cuboid regions (#1827) 2021-07-13 11:10:11 +10:00
Octavia Togami
40ded939ef
Fix loading legacy invalid blocks 2021-07-04 16:55:27 -07:00
Octavia Togami
0790e6e5d8
Fix CLI Mess (#1811)
* Fix CLI awfulness

* Fix indentation

* Licenses
2021-07-01 09:44:44 -07:00