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.

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

Backwards Compatible backport and rewrite. #7

Merged
merged 183 commits into from
Nov 5, 2023

Conversation

Lyfts
Copy link
Member

@Lyfts Lyfts commented Oct 24, 2023

Backport of FTBU, FTBL and Aurora, with lots of new features useful for server admins. (and players)

I can't push to the other branch since org purge and it doesn't look like Ethryan is still working on it. So I thought I would open a new pr in order to adress potential reviews. Don't know how anyone is supposed to review this tho :)

Of course big credit to Ethryan and koi330 for much of the early work.

What's new

World logging (Block break, player right click, block place, player attack, chat log)
Drag claiming on chunk map (Hold Shift to chunkload, CTRL to claim in a large square)
Lots of new commands
Teams (replaces the old friend system)
Permission system
Improved GUI
Lots of new useful config options
NBTEdit - edit item, entity, block and even player nbt data ingame
+more probably :)
and it of course still has the backup, auto restart etc. that we are used to.

It's also fully backwards compatible for homes, chunks, warps and most of the config which will all be loaded on first startup. This has been tested with a couple of my own worlds as well as the ballers world download, all of Sampsa's 2400 claimed and loaded chunks converted correctly.

A bit of time has been spent cleaning up the mods as well as combine the 3 into 1 single mod, which will hopefully improve maintainability a bit. There's still a lot of cleanup that could be done, all the events are only being used for internal mod communication so they could all be removed and there's a number of unused classes and methods spread throughout.

All the critical bugs that I have encountered has been fixed and it feels just about ready for release now. It's become a bit of passion project at this point, so I'll be ready for any additional bugs that pop up.

Closes: GTNewHorizons/GT-New-Horizons-Modpack#14410
all this just to close a ticket 💯

@bombcar
Copy link
Member

bombcar commented Oct 25, 2023

As for the loaded chunks it needs to be somewhat consistent with the team color as other players will see it as well. I can make the loaded chunks darker/lighter or if you have any other good ideas let me know.

Maybe a hatch pattern? Slightly darker would probably be fine, or even just lines of slightly darker. Whatever's easiest to code. It's not like people use that minimap for navigation but if you're in the center of a 2400 chunk base it might not be easy to see if a chunk is not chunk loaded without hovering over it.

@Dream-Master yah is me back from the dead, started a new run because Minecraft vanilla sucks too hard - freaking glowsquid

@bombcar
Copy link
Member

bombcar commented Oct 25, 2023

The build and test crash is missing something required, because a local build and run in a full pack works fine.

Strangely enough RunClient on my machine works fine.

Maybe it's a config init issue?

Caused by: java.lang.IllegalStateException: Not a JSON Object: null
at com.google.gson.JsonElement.getAsJsonObject(JsonElement.java:90) ~[JsonElement.class:?]
at serverutils.data.BackwardsCompat.(BackwardsCompat.java:38) ~[BackwardsCompat.class:?]
at serverutils.ranks.Ranks.reload(Ranks.java:138) ~[Ranks.class:?]

@Lyfts
Copy link
Member Author

Lyfts commented Oct 25, 2023

Yeah it's missing a check in the config compat.
I'll push a fix whenever my internet comes back.

@Ethryan
Copy link
Contributor

Ethryan commented Oct 25, 2023

Hmm, i think it needs a nullcheck, since the file don't exist on a completely new install. It would probably crash if you deleted the config files in an existing setup too since it then can't find the specified file.

@Rika-TH
Copy link

Rika-TH commented Oct 25, 2023

DRAG CLAIMING LETSFUCKINGGOOOOO

@Caedis
Copy link
Member

Caedis commented Oct 25, 2023

That should fix that issue


@SubscribeEvent
public void onHomeEvent(AuroraHomePageEvent event) {
event.add(new HomePageEntry("Mod List", "modlist", "https://i.imgur.com/yQNrfg7.png"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we embed these images or pull from the minecraft assets so that its not reliant on imgur?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would love that, but I don't have a clue how to embed a local image onto an html page using java...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right, I was in the aurora embed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The image is of Redstone dust so it's not like we lose anything major if Imgur goes down later

Copy link
Contributor

@Ethryan Ethryan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been running this in an instance with the 2.4.2dev version of the pack, and the only thing major that has happened to me is when i accidentally used the /back command to try and teleport back to an area from a previous playsession. It warped me into the void at spawn instead of the correct location. How about trying to fix this by warping to your bed when it can't find the correct location and the y value is 0?

@Lyfts
Copy link
Member Author

Lyfts commented Nov 4, 2023

@Ethryan it was never actually saving your last position and would just send you to 0, 0, 0. That should be all good now.

@Ethryan
Copy link
Contributor

Ethryan commented Nov 5, 2023

This can probably be merged, but be aware that I haven’t tested everything changed yet.

@bombcar
Copy link
Member

bombcar commented Nov 5, 2023

I don't see how to remotely unclaim a chunk? I have a claimed miner chunk but I forgot to unclaim after recovering the miner.

I wonder if it would be possible to make chunk claiming a journeymap overlay.

@Ethryan
Copy link
Contributor

Ethryan commented Nov 5, 2023

There is the button to unclaim all chunks in the dimension.

@Lyfts
Copy link
Member Author

Lyfts commented Nov 5, 2023

@bombcar I already have Journeymap overlay close to ready. Interacting with chunks would however require some more mixin magic on Visual prospectings side.
For now you can do /chunks unclaim_all [dimension name] (or use the button). Their names might not be registered correctly, but you should be able to tab complete to see them.

WIP

sneak

@raylras
Copy link

raylras commented Nov 5, 2023

It generates a nether portal when I teleporting between dim -1 and dim 0.

The usage of net.minecraft.entity.Entity#travelToDimension method seems incorrect here:

if (dim != entity.dimension) {
entity.travelToDimension(dim);
return entity;
}

@mitchej123
Copy link
Contributor

@bombcar I already have Journeymap overlay close to ready. Interacting with chunks would however require some more mixin magic on Visual prospectings side. For now you can do /chunks unclaim_all [dimension name] (or use the button). Their names might not be registered correctly, but you should be able to tab complete to see them.

WIP

Are you sending this as a separate PR? Should I go ahead and merge this?

@mitchej123 mitchej123 merged commit 89d0d3d into GTNewHorizons:master Nov 5, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FTBU drag claiming
8 participants