MinecraftForge / ForgeFlower

Forge's modifications to FernFlower. Fixing various bugs/inconsistencies. Main Repo: https://github.com/MinecraftForge/FernFlower
Apache License 2.0
80 stars 44 forks source link

Remove the default keyword from private interface methods #104

Closed coehlrich closed 2 years ago

coehlrich commented 2 years ago

Removes the default keyword from private interface methods since private interface methods just use private instead of private default

1.18 Pre Release 1 diff:

diff --git a/net/minecraft/world/level/CollisionGetter.java b/net/minecraft/world/level/CollisionGetter.java
index 68894da..76dd14b 100644
--- a/net/minecraft/world/level/CollisionGetter.java
+++ b/net/minecraft/world/level/CollisionGetter.java
@@ -75,7 +75,7 @@ public interface CollisionGetter extends BlockGetter {
    }

    @Nullable
-   private default VoxelShape m_186440_(Entity p_186441_, AABB p_186442_) {
+   private VoxelShape m_186440_(Entity p_186441_, AABB p_186442_) {
       WorldBorder worldborder = this.m_6857_();
       return worldborder.m_187566_(p_186441_, p_186442_) ? worldborder.m_61946_() : null;
    }
diff --git a/net/minecraft/world/level/LevelAccessor.java b/net/minecraft/world/level/LevelAccessor.java
index 1811d4e..1c80224 100644
--- a/net/minecraft/world/level/LevelAccessor.java
+++ b/net/minecraft/world/level/LevelAccessor.java
@@ -29,11 +29,11 @@ public interface LevelAccessor extends CommonLevelAccessor, LevelTimeAccess {

    LevelTickAccess<Block> m_183326_();

-   private default <T> ScheduledTick<T> m_186482_(BlockPos p_186483_, T p_186484_, int p_186485_, TickPriority p_186486_) {
+   private <T> ScheduledTick<T> m_186482_(BlockPos p_186483_, T p_186484_, int p_186485_, TickPriority p_186486_) {
       return new ScheduledTick(p_186484_, p_186483_, this.m_6106_().m_6793_() + (long)p_186485_, p_186486_, this.m_183596_());
    }

-   private default <T> ScheduledTick<T> m_186478_(BlockPos p_186479_, T p_186480_, int p_186481_) {
+   private <T> ScheduledTick<T> m_186478_(BlockPos p_186479_, T p_186480_, int p_186481_) {
       return new ScheduledTick(p_186480_, p_186479_, this.m_6106_().m_6793_() + (long)p_186481_, this.m_183596_());
    }