Bogdan-G / FFoKC

Fork of Fork of KCauldron and edit for testing and for BMPL =D
Do What The F*ck You Want To Public License
8 stars 12 forks source link

Ошибки в World.java при компилировании. #4

Closed ghost closed 6 years ago

ghost commented 6 years ago

День добрый. На стадии компилирования ядра вылезают данные ошибки.

P.S. Примерно тоже самое при компилировании конечных билдов, аля 34.71. Хотелось бы конечно попробовать самые свежие исходники.

Что использовал: Ubuntu Zulu JDK 8up163

Сам лог:

:obfuscateJar :cauldron:compileJava /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2521: error: illegal start of expression / // CraftBukkit end ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2521: error: illegal start of expression / // CraftBukkit end ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2562: error: illegal start of expression public void func_147448_a(Collection p_1474481) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2562: error: illegal start of expression public void func_147448_a(Collection p_1474481) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2562: error: ';' expected public void func_147448_a(Collection p_1474481) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2562: error: ';' expected public void func_147448_a(Collection p_1474481) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2576: error: illegal start of expression public void updateEntity(Entity p_728701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2576: error: illegal start of expression public void updateEntity(Entity p_728701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2576: error: ';' expected public void updateEntity(Entity p_728701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2576: error: ';' expected public void updateEntity(Entity p_728701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: illegal start of expression public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: illegal start of expression public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: ';' expected public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: expected public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: not a statement public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2581: error: ';' expected public void updateEntityWithOptionalForce(Entity p_728661, boolean p_728662) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2697: error: illegal start of expression public boolean checkNoEntityCollision(AxisAlignedBB p_728551) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2697: error: ';' expected public boolean checkNoEntityCollision(AxisAlignedBB p_728551) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2697: error: ';' expected public boolean checkNoEntityCollision(AxisAlignedBB p_728551) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2702: error: illegal start of expression public boolean checkNoEntityCollision(AxisAlignedBB p_729171, Entity p_729172) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2702: error: ';' expected public boolean checkNoEntityCollision(AxisAlignedBB p_729171, Entity p_729172) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2702: error: ';' expected public boolean checkNoEntityCollision(AxisAlignedBB p_729171, Entity p_729172) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2702: error: not a statement public boolean checkNoEntityCollision(AxisAlignedBB p_729171, Entity p_729172) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2702: error: ';' expected public boolean checkNoEntityCollision(AxisAlignedBB p_729171, Entity p_729172) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2719: error: illegal start of expression public boolean checkBlockCollision(AxisAlignedBB p_728291) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2719: error: ';' expected public boolean checkBlockCollision(AxisAlignedBB p_728291) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2719: error: ';' expected public boolean checkBlockCollision(AxisAlignedBB p_728291) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2762: error: illegal start of expression public boolean isAnyLiquid(AxisAlignedBB p_729531) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2762: error: ';' expected public boolean isAnyLiquid(AxisAlignedBB p_729531) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2762: error: ';' expected public boolean isAnyLiquid(AxisAlignedBB p_729531) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2805: error: illegal start of expression public boolean func_147470_e(AxisAlignedBB p_1474701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2805: error: ';' expected public boolean func_147470_e(AxisAlignedBB p_1474701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2805: error: ';' expected public boolean func_147470_e(AxisAlignedBB p_1474701) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: illegal start of expression public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: ';' expected public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: ';' expected public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: not a statement public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: ';' expected public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2840: error: ';' expected public boolean handleMaterialAcceleration(AxisAlignedBB p_729181, Material p_729182, Entity p_729183) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2893: error: illegal start of expression public boolean isMaterialInBB(AxisAlignedBB p_728751, Material p_728752) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2893: error: ';' expected public boolean isMaterialInBB(AxisAlignedBB p_728751, Material p_728752) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2893: error: ';' expected public boolean isMaterialInBB(AxisAlignedBB p_728751, Material p_728752) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2893: error: not a statement public boolean isMaterialInBB(AxisAlignedBB p_728751, Material p_728752) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2893: error: ';' expected public boolean isMaterialInBB(AxisAlignedBB p_728751, Material p_728752) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2919: error: illegal start of expression public boolean isAABBInMaterial(AxisAlignedBB p_728301, Material p_728302) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2919: error: ';' expected public boolean isAABBInMaterial(AxisAlignedBB p_728301, Material p_728302) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2919: error: ';' expected public boolean isAABBInMaterial(AxisAlignedBB p_728301, Material p_728302) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2919: error: not a statement public boolean isAABBInMaterial(AxisAlignedBB p_728301, Material p_728302) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2919: error: ';' expected public boolean isAABBInMaterial(AxisAlignedBB p_728301, Material p_728302) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: illegal start of expression public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: ';' expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: not a statement public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: ';' expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: not a statement public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: ';' expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: not a statement public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2958: error: ';' expected public Explosion createExplosion(Entity p_728761, double p_728762, double p_728764, double p_728766, float p_728768, boolean p_728769) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: illegal start of expression public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: ';' expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: not a statement public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: ';' expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: not a statement public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: ';' expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: not a statement public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: ';' expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2963: error: ';' expected public Explosion newExplosion(Entity p_728851, double p_728852, double p_728854, double p_728856, float p_728858, boolean p_728859, boolean p_7288510) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2974: error: illegal start of expression public float getBlockDensity(Vec3 p_728421, AxisAlignedBB p_728422) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2974: error: ';' expected public float getBlockDensity(Vec3 p_728421, AxisAlignedBB p_728422) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2974: error: ';' expected public float getBlockDensity(Vec3 p_728421, AxisAlignedBB p_728422) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2974: error: not a statement public float getBlockDensity(Vec3 p_728421, AxisAlignedBB p_728422) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:2974: error: ';' expected public float getBlockDensity(Vec3 p_728421, AxisAlignedBB p_728422) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: illegal start of expression public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: ';' expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: not a statement public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: ';' expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: not a statement public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: ';' expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3013: error: ';' expected public boolean extinguishFire(EntityPlayer p_728861, int p_728862, int p_728863, int p_728864, int p_728865) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3058: error: ';' expected public String getDebugLoadedEntities() ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3064: error: ';' expected public String getProviderName() ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: illegal start of expression public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: ';' expected public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: expected public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: not a statement public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: ';' expected public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3069: error: ';' expected public TileEntity getTileEntity(int p_1474381, int p_1474382, int p_1474383) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: illegal start of expression public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: illegal start of expression public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: ';' expected public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: expected public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: not a statement public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ /home/user/mine/FFoKC/eclipse/cauldron/src/main/java/net/minecraft/world/World.java:3123: error: ';' expected public void setTileEntity(int p_1474551, int p_1474552, int p_1474553, TileEntity p_1474554) ^ 100 errors :obfuscateJar FAILED

FAILURE: Build failed with an exception.

1000D commented 6 years ago

Там всего один комментарий вроде лишний надо убрать. Ничего интересного в этом билде нет. Все баги те же самые, да и сам билд довольно старый.

ghost commented 6 years ago

Там более десяти ошибок и все в разных комментариях. Ошибки в World.java наблюдаются во всех билдах, даже старых...

Вы про какой именно билд? Если 34.71, то его и так можно скачать готовый. В свежих коммитах есть пару интересных исправлений и фишек, в частности это: 1) add new config options: a) disable ActivationRange, enable max ActivationRange, ignore ActivationRange; b) disable TrackingRange, enable max TrackingRange;

и обнова до свежего MF, с патчами из forkage:

2) update to latest MFF 15.02.18;

1000D commented 6 years ago

Ну новые патчи накладываются. Учитывая что ни в каулдроне, ни в термосе ActivationRange в дефолте и так совершенно не работал и работает ли он здесь? (чтобы он заработал, пришлось править самому), суть этих изменений не ясна.

Bogdan-G commented 6 years ago

всем привет, уведомления гитхаба возможно не работают всегда корректно или что-то глючит, узнал про исус только вручную зайдя сюда. Чтобы скомпилировать изменения нужно применить патч patch.patch из папки eclipse-patch, так же в зависимостях стоят модифицированный FG: https://github.com/Bogdan-G/ForgeGradle/commits/FG_1.2 и к нему модифицированный https://github.com/Bogdan-G/diff4j/commits/master

суть этих изменений не ясна.

чтобы выключить работу этой штуки и убрать instanceof проверки.

ПС обновления так же публикуются в вк группе или в вк в лс например: https://vk.com/mbc_bmpl

bagomot commented 5 years ago

Приветствую! Пытаюсь применить патч, но выдает ошибку: error: git apply: bad git-diff - inconsistent old filename on line 416 Как это исправить?

Bogdan-G commented 5 years ago

@perezzloy патч последний? я исправлял проблему, патч применять так: берем содержимое папки clean заменяем им содержимое папки cauldron, потом применяем патч, патч сравнивает разницу между clean и cauldron.

bagomot commented 5 years ago

@Bogdan-G я использовал Intellij IDEA, а там eclipse-workspace не используется. В репозитории eclipse-workspace-dev.zip содержит папку Clean, но она пустая. Попробую через Эклипс, ну или придется вручную патчить.

Bogdan-G commented 5 years ago

@perezzloy есть папка которая используется компиляции? Файлы должны где то лежать. Я исп консоль через bash, папка gradle добавлена в переменные среды.