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

Cleanup #76

Merged
merged 18 commits into from Jun 5, 2023
Merged

Cleanup #76

merged 18 commits into from Jun 5, 2023

Conversation

glowredman
Copy link
Member

  • Update buildscript
  • Enable generic injection and fix all warnings/errors caused by this
  • Replace multiples of π
  • Replace deprecated code
  • Do /gchelp chat output via code and not by serializing JSON
  • Fix check of active potion effects in BlockCavernousVine#onEntityCollidedWithBlock
  • Use actual version in @API annotations
  • Give subpackages of api package different api names (API hierachy equals package hierachy)
  • Eclipse custom cleanup ("Cleanup: xxx" commits)
  • Apply spotless

@glowredman glowredman requested review from a team June 5, 2023 18:38
Copy link
Member

@wlhlm wlhlm left a comment

Choose a reason for hiding this comment

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

Yes, I definitely read all 25k changed lines. Joking aside, all the refactorings seem sensible to me.

@Dream-Master Dream-Master merged commit 4a0c7b3 into master Jun 5, 2023
1 check passed
@Dream-Master Dream-Master deleted the cleanup branch June 5, 2023 19:39
@@ -256,8 +256,8 @@ public void onUpdate() {
final List<?> var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, box);

if (var15 != null && !var15.isEmpty()) {
for (int var52 = 0; var52 < var15.size(); ++var52) {
final Entity var17 = (Entity) var15.get(var52);
for (Object element : var15) {
Copy link
Member

Choose a reason for hiding this comment

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

This can now be Entity if you fix the generic type above

@@ -93,8 +93,8 @@ public void onUpdate() {
.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(1.0D, 0.5D, 1.0D));

if (var3 != null) {
for (int var4 = 0; var4 < var3.size(); ++var4) {
final Entity var5 = (Entity) var3.get(var4);
for (Object element : var3) {
Copy link
Member

Choose a reason for hiding this comment

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

Entity

@@ -118,8 +118,8 @@ public void onUpdate() {
.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(1.0D, 0.5D, 1.0D));

if (var3 != null) {
for (int var4 = 0; var4 < var3.size(); ++var4) {
final Entity var5 = (Entity) var3.get(var4);
for (Object element : var3) {
Copy link
Member

Choose a reason for hiding this comment

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

Entity


if (e instanceof EntityTieredRocket) {
final EntityTieredRocket ship = (EntityTieredRocket) e;
for (Object element : l) {
Copy link
Member

Choose a reason for hiding this comment

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

Entity


if (e instanceof EntityTieredRocket) {
final EntityTieredRocket ship = (EntityTieredRocket) e;
for (Object element : l) {
Copy link
Member

Choose a reason for hiding this comment

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

Entity

glowredman added a commit that referenced this pull request Jun 11, 2023
@glowredman glowredman mentioned this pull request Jun 11, 2023
glowredman added a commit that referenced this pull request Jun 12, 2023
* Fix oversights of last PR

See @eigenraven's review of #76

* Update dependencies

* Rework rocket fuel API
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants