feat: allow placement of minecraft gen features and structures #2364

dordsor21 · 2023-07-17T21:52:13Z

closes Generation of Minecraft features and structures #2343

SirYwell · 2023-07-27T19:37:29Z

This only works if the EditSession is backed by an actual World, I think this should be outlined in the Javadocs.

dordsor21 · 2023-07-28T21:33:55Z

noticed upstream has this functionality, will change to match them and cherry-pick where appropriate

…eHub/WorldEdit#2239) * Add a feature generator and allow undoing of feature placement [WIP] Apply changes to Forge as well Use proper translatable components * Add a brush version of the feature command Use Java proxy classes * Add for Bukkit (only 1.19.3 for now) Clean up the proxies to use a switch Checkstyle is grumpy Add the obfuscated versions Remove debug text Fix missed "destroyBlock" deobfuscated proxy function * checkstyle

(cherry picked from commit 5ca80395a35100c2d7686ad8839baaa57f8db07c)

github-actions · 2023-11-21T17:28:27Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

SirYwell

As there's a mix of structures and features here, what exactly do we add what WE doesn't add? StructureType is in the WE source here, but the commands and the tools for it are in the FAWE source, that's a bit confusing to me right now.

SirYwell · 2023-11-23T09:11:04Z

...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java

@@ -555,6 +571,164 @@ protected ServerLevel getServerLevel(final World world) {
        return ((CraftWorld) world).getHandle();
    }

+    @Override


There is some similarity to the generateTree code here. Can we move it to the FaweAdapter too? I also think the Map<BlockPos, CraftBlockState> can be simplified to a list similar to how it's done in generateTree now.

I was going to look at doing so yeah. It would be more complicated though as the method changes per version a couple of times

Yeah I don't think that's very viable. We're not able to make any meaningful amount of abstraction as almost every line has a NMS class

SirYwell · 2023-11-23T09:13:45Z

...om/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightServerLevelDelegateProxy.java

+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class PaperweightServerLevelDelegateProxy implements InvocationHandler {


This class seems to be unused in that version. Did you miss upstream changes in the PaperweightAdapter? Generally, do we use that code (the changes in this PR to files in ext/) ourselves?

Yeah I think there's some cleanup required to marry the implementation across each of the adapter versions

Also, no, we don't use the changes in the ext classes, however, I think it's useful to have the WE code there for reference

dordsor21 · 2023-11-23T09:37:43Z

As there's a mix of structures and features here, what exactly do we add what WE doesn't add? StructureType is in the WE source here, but the commands and the tools for it are in the FAWE source, that's a bit confusing to me right now.

The various Tool/Factory classes are in FAWE because they are classes added by FAWE. The actual command methods are in com.sk89q because all commands are there, and are effectively just class edits, not new classes.

This implementation was in line with how we handle tree generation, and if we can avoid using an InvocationHandler when it's not needed I think we should (the same for any reflection really)

NotMyFault · 2023-12-08T06:33:19Z

Please rebase for 1.20.3/4

github-actions · 2024-03-17T07:39:19Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java

SirYwell · 2024-03-28T09:09:44Z

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/FeaturePlacer.java

+                boolean successful = false;
+
+                final BlockVector3 pos = clicked.toVector().add().toBlockPoint();
+                for (int i = 0; i < 10; i++) {


What's the repetition for?

I believe it exists/existed somewhere in Minecaaft or upstream? There is often a random aspect to a feature or structure (e.g. tree height) that means it might fail to be constructed occasionally. This is an arbitrary way to try a few times basically

.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_18_R2/PaperweightFaweAdapter.java

SirYwell · 2024-03-28T12:41:41Z

For some reason there is a folder with a . instead of nested folders for the 1.20.4 adapter

SirYwell · 2024-03-28T13:02:45Z

From a quick test, it looks like e.g. //structure bastion_remnant throws an exception. I don't know if we can fix it, but I think it should at least be handled in a way that doesn't spam the console making it look like FAWE is doing something wrong.

Similarly, features and structures often cannot be placed with messages "Failed to generated structure. Is it a valid spot for it?" and "This feature cannot go here. Ensure the area meets the requirements." In fact, I wasn't able to spawn any feature for now. Can we somehow lift those restrictions? Otherwise, this is very limiting in its use.

dordsor21 · 2024-03-28T13:05:04Z

From a quick test, it looks like e.g. //structure bastion_remnant throws an exception. I don't know if we can fix it, but I think it should at least be handled in a way that doesn't spam the console making it look like FAWE is doing something wrong.

Yes probably worth doing that

Similarly, features and structures often cannot be placed with messages "Failed to generated structure. Is it a valid spot for it?" and "This feature cannot go here. Ensure the area meets the requirements." In fact, I wasn't able to spawn any feature for now. Can we somehow lift those restrictions? Otherwise, this is very limiting in its use.

I tried, but no. Minecraft generation code is complete spaghetti and it would require an incredible amount of reflection and likely need us to perform changes to the byte code. The command in upstream WE has the same limitations

github-actions · 2024-05-19T11:34:33Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/FaweBlockStateListPopulator.java # worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java

dordsor21 requested a review from a team as a code owner July 17, 2023 21:52

github-actions bot added the Feature This PR adds a new feature label Jul 17, 2023

dordsor21 marked this pull request as draft October 14, 2023 19:35

me4502 and others added 3 commits October 24, 2023 16:46

Add structure generator command

f2f01eb

(cherry picked from commit 5ca80395a35100c2d7686ad8839baaa57f8db07c)

FAWE-inate

594527f

dordsor21 force-pushed the feat/feature-placement branch from 50a3328 to 594527f Compare October 24, 2023 16:33

dordsor21 marked this pull request as ready for review October 24, 2023 16:33

dordsor21 changed the title ~~feat: allow placement of minecraft ConfiguredFeatures~~ feat: allow placement of minecraft gen features and structures Oct 24, 2023

cleanup

5a39197

github-actions bot added the unresolved-merge-conflict label Nov 21, 2023

Merge branch 'main' into feat/feature-placement

7150f53

github-actions bot removed the unresolved-merge-conflict label Nov 21, 2023

fix merge issues

c7f359a

SirYwell requested changes Nov 23, 2023

View reviewed changes

bring more in line with upstream

fee6c4d

dordsor21 requested a review from SirYwell December 3, 2023 15:13

dordsor21 added 4 commits December 12, 2023 17:08

Merge branch 'main' into feat/feature-placement

9e75066

Update 1.20.3/4 adapters

324dfa8

Merge branch 'main' into feat/feature-placement

0957d55

Merge branch 'main' into feat/feature-placement

e89e266

github-actions bot added the unresolved-merge-conflict label Mar 17, 2024

Merge branch 'main' into feat/feature-placement

d266201

# Conflicts: # worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java

github-actions bot removed the unresolved-merge-conflict label Mar 17, 2024

Merge branch 'main' into feat/feature-placement

3eecb36

SirYwell requested changes Mar 28, 2024

View reviewed changes

fix ext.fawe -> ext/fawe

2e9e78d

github-actions bot added the unresolved-merge-conflict label May 19, 2024

github-actions bot removed the unresolved-merge-conflict label May 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: allow placement of minecraft gen features and structures #2364

feat: allow placement of minecraft gen features and structures #2364

dordsor21 commented Jul 17, 2023 •

edited

SirYwell commented Jul 27, 2023

dordsor21 commented Jul 28, 2023

github-actions bot commented Nov 21, 2023

SirYwell left a comment

SirYwell Nov 23, 2023

dordsor21 Nov 23, 2023

dordsor21 Nov 23, 2023 •

edited

SirYwell Nov 23, 2023

dordsor21 Nov 23, 2023

dordsor21 Nov 23, 2023

dordsor21 commented Nov 23, 2023 •

edited

NotMyFault commented Dec 8, 2023

github-actions bot commented Mar 17, 2024

SirYwell Mar 28, 2024

dordsor21 Mar 28, 2024

SirYwell commented Mar 28, 2024

SirYwell commented Mar 28, 2024

dordsor21 commented Mar 28, 2024

github-actions bot commented May 19, 2024

feat: allow placement of minecraft gen features and structures #2364

Are you sure you want to change the base?

feat: allow placement of minecraft gen features and structures #2364

Conversation

dordsor21 commented Jul 17, 2023 • edited

SirYwell commented Jul 27, 2023

dordsor21 commented Jul 28, 2023

github-actions bot commented Nov 21, 2023

SirYwell left a comment

Choose a reason for hiding this comment

SirYwell Nov 23, 2023

Choose a reason for hiding this comment

dordsor21 Nov 23, 2023

Choose a reason for hiding this comment

dordsor21 Nov 23, 2023 • edited

Choose a reason for hiding this comment

SirYwell Nov 23, 2023

Choose a reason for hiding this comment

dordsor21 Nov 23, 2023

Choose a reason for hiding this comment

dordsor21 Nov 23, 2023

Choose a reason for hiding this comment

dordsor21 commented Nov 23, 2023 • edited

NotMyFault commented Dec 8, 2023

github-actions bot commented Mar 17, 2024

SirYwell Mar 28, 2024

Choose a reason for hiding this comment

dordsor21 Mar 28, 2024

Choose a reason for hiding this comment

SirYwell commented Mar 28, 2024

SirYwell commented Mar 28, 2024

dordsor21 commented Mar 28, 2024

github-actions bot commented May 19, 2024

dordsor21 commented Jul 17, 2023 •

edited

dordsor21 Nov 23, 2023 •

edited

dordsor21 commented Nov 23, 2023 •

edited