refactoring
/
SLC-1.8.9
mirror of https://github.com/refactorinqq/SLC-1.8.9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from Silent-Client/TEST2 

Test2
This commit is contained in:
kirillsaint 2024-05-09 15:53:37 +06:00 committed by GitHub
parent 82880385e3 0a30dec288
commit 76a54ff91a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 255 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/silentclient/client/mixin/SilentClientTransformer.java
View File

@ -2,10 +2,7 @@ package net.silentclient.client.mixin;
import net.minecraft.launchwrapper.IClassTransformer;
import net.silentclient.client.Client;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.*;
import java.lang.reflect.Modifier;
@ -18,11 +15,11 @@ public class SilentClientTransformer implements IClassTransformer {
return null;
}
if(transformedName.equals("bfl$e") || transformedName.equals("bfl$r") || transformedName.equals("bnm$a") || transformedName.equals("ajd$a") || transformedName.equals("bha$a")) {
if(transformedName.equals("bfl$e") || transformedName.equals("bfl$r") || transformedName.equals("bnm$a") || transformedName.equals("ajd$a") || transformedName.equals("bha$a") || transformedName.equals("re$a")) {
Client.logger.info("Transforming class: " + transformedName);
ClassReader classreader = new ClassReader(bytes);
ClassWriter classwriter = new ClassWriter(1);
SilentClientTransformer.AccessTransformerVisitor visitor = new SilentClientTransformer.AccessTransformerVisitor(262144, classwriter);
SilentClientTransformer.AccessTransformerVisitor visitor = new AccessTransformerVisitor(262144, classwriter);
classreader.accept(visitor, 0);
return classwriter.toByteArray();
}
@ -34,7 +31,7 @@ public class SilentClientTransformer implements IClassTransformer {
return clazz.getName().replace(".", "/");
}
public class AccessTransformerVisitor extends ClassVisitor {
public static class AccessTransformerVisitor extends ClassVisitor {
public AccessTransformerVisitor(int api, ClassVisitor cv) {
super(api, cv);

9
src/main/java/net/silentclient/client/mixin/accessors/EntityLivingAccessor.java Normal file
View File

@ -0,0 +1,9 @@
package net.silentclient.client.mixin.accessors;
import net.minecraft.entity.EntityLiving;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(value={EntityLiving.class})
public interface EntityLivingAccessor {
}

44
src/main/java/net/silentclient/client/mixin/accessors/EntityLookHelperAccessor.java Normal file
View File

@ -0,0 +1,44 @@
package net.silentclient.client.mixin.accessors;
import net.minecraft.entity.ai.EntityLookHelper;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(value={EntityLookHelper.class})
public interface EntityLookHelperAccessor {
@Accessor(value="deltaLookYaw")
public float getDeltaLookYaw();
@Accessor(value="deltaLookYaw")
public void setDeltaLookYaw(float var1);
@Accessor(value="deltaLookPitch")
public float getDeltaLookPitch();
@Accessor(value="deltaLookPitch")
public void setDeltaLookPitch(float var1);
@Accessor(value="isLooking")
public boolean isLooking();
@Accessor(value="isLooking")
public void setLooking(boolean var1);
@Accessor(value="posX")
public double getPosX();
@Accessor(value="posX")
public void setPosX(double var1);
@Accessor(value="posY")
public double getPosY();
@Accessor(value="posY")
public void setPosY(double var1);
@Accessor(value="posZ")
public double getPosZ();
@Accessor(value="posZ")
public void setPosZ(double var1);
}

5
src/main/java/net/silentclient/client/mixin/ducks/EntityAITasksExt.java Normal file
View File

@ -0,0 +1,5 @@
package net.silentclient.client.mixin.ducks;
public interface EntityAITasksExt {
Object client$getTaskEntries();
}

7
src/main/java/net/silentclient/client/mixin/ducks/EntityLivingExt.java Normal file
View File

@ -0,0 +1,7 @@
package net.silentclient.client.mixin.ducks;
public interface EntityLivingExt {
void client$setLookHelper(Object var1);
Object client$getTasks();
}

5
src/main/java/net/silentclient/client/mixin/ducks/EntityLookHelperExt.java Normal file
View File

@ -0,0 +1,5 @@
package net.silentclient.client.mixin.ducks;
public interface EntityLookHelperExt {
Object client$getEntity();
}

19
src/main/java/net/silentclient/client/mixin/mixins/EntityAITasksMixin.java Normal file
View File

@ -0,0 +1,19 @@
package net.silentclient.client.mixin.mixins;
import net.minecraft.entity.ai.EntityAITasks;
import net.silentclient.client.mixin.ducks.EntityAITasksExt;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import java.util.List;
@Mixin(EntityAITasks.class)
public class EntityAITasksMixin implements EntityAITasksExt {
@Shadow private List<EntityAITasks.EntityAITaskEntry> taskEntries;
@Override
public Object client$getTaskEntries() {
return this.taskEntries;
}
}

26
src/main/java/net/silentclient/client/mixin/mixins/EntityLivingMixin.java Normal file
View File

@ -0,0 +1,26 @@
package net.silentclient.client.mixin.mixins;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.ai.EntityAITasks;
import net.minecraft.entity.ai.EntityLookHelper;
import net.silentclient.client.mixin.ducks.EntityLivingExt;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(EntityLiving.class)
public class EntityLivingMixin implements EntityLivingExt {
@Shadow private EntityLookHelper lookHelper;
@Shadow @Final protected EntityAITasks tasks;
@Override
public void client$setLookHelper(Object var1) {
this.lookHelper = (EntityLookHelper) var1;
}
@Override
public Object client$getTasks() {
return this.tasks;
}
}

17
src/main/java/net/silentclient/client/mixin/mixins/EntityLookHelperMixin.java Normal file
View File

@ -0,0 +1,17 @@
package net.silentclient.client.mixin.mixins;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.ai.EntityLookHelper;
import net.silentclient.client.mixin.ducks.EntityLookHelperExt;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(EntityLookHelper.class)
public class EntityLookHelperMixin implements EntityLookHelperExt {
@Shadow private EntityLiving entity;
@Override
public Object client$getEntity() {
return this.entity;
}
}

62
src/main/java/net/silentclient/client/mods/other/ai/FixedEntityLookHelper.java Normal file
View File

@ -0,0 +1,62 @@
package net.silentclient.client.mods.other.ai;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.ai.EntityLookHelper;
import net.minecraft.util.MathHelper;
import net.silentclient.client.mixin.accessors.EntityLookHelperAccessor;
import net.silentclient.client.mixin.ducks.EntityLookHelperExt;
/**
* Created by Dark on 7/20/2015.
*/
public class FixedEntityLookHelper extends EntityLookHelper
{
public FixedEntityLookHelper(EntityLiving entity)
{
super(entity);
}
@Override
public void onUpdateLook() {
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationPitch = 0.0f;
if (((EntityLookHelperAccessor)((Object)this)).isLooking()) {
((EntityLookHelperAccessor)((Object)this)).setLooking(false);
double d0 = ((EntityLookHelperAccessor)((Object)this)).getPosX() - ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).posX;
double d1 = ((EntityLookHelperAccessor)((Object)this)).getPosY() - (((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).posY + (double)((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).getEyeHeight());
double d2 = ((EntityLookHelperAccessor)((Object)this)).getPosZ() - ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).posZ;
double d3 = MathHelper.sqrt_double(d0 * d0 + d2 * d2);
float f = (float)((double)FixedEntityLookHelper.tan(d2, d0) * 180.0 / Math.PI) - 90.0f;
float f1 = (float)(-((double)FixedEntityLookHelper.tan(d1, d3) * 180.0 / Math.PI));
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationPitch = this.updateRotation(((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationPitch, f1, ((EntityLookHelperAccessor)((Object)this)).getDeltaLookPitch());
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead = this.updateRotation(((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead, f, ((EntityLookHelperAccessor)((Object)this)).getDeltaLookYaw());
} else {
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead = this.updateRotation(((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead, ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).renderYawOffset, 10.0f);
}
float f2 = MathHelper.wrapAngleTo180_float(((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead - ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).renderYawOffset);
if (!((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).getNavigator().noPath()) {
if (f2 < -75.0f) {
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead = ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).renderYawOffset - 75.0f;
}
if (f2 > 75.0f) {
((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).rotationYawHead = ((EntityLiving) ((EntityLookHelperExt) this).client$getEntity()).renderYawOffset + 75.0f;
}
}
}
private float updateRotation(float a, float b, float c) {
float f = MathHelper.wrapAngleTo180_float(b - a);
if (f > c) {
f = c;
}
if (f < -c) {
f = -c;
}
return a + f;
}
public static float tan(double a, double b)
{
return FastTrig.atan2(a, b);
}
}

48
src/main/java/net/silentclient/client/mods/settings/FPSBoostMod.java
View File

@ -3,16 +3,31 @@ package net.silentclient.client.mods.settings;
import com.google.common.collect.Sets;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAITasks;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.EntityLookHelper;
import net.minecraft.init.Blocks;
import net.silentclient.client.Client;
import net.silentclient.client.event.EventManager;
import net.silentclient.client.event.EventTarget;
import net.silentclient.client.event.impl.EntityJoinLevelEvent;
import net.silentclient.client.mixin.accessors.EntityLookHelperAccessor;
import net.silentclient.client.mixin.ducks.EntityAITasksExt;
import net.silentclient.client.mixin.ducks.EntityLivingExt;
import net.silentclient.client.mods.Mod;
import net.silentclient.client.mods.ModCategory;
import net.silentclient.client.mods.Setting;
import net.silentclient.client.mods.other.ai.FastTrig;
import net.silentclient.client.mods.other.ai.FixedEntityLookHelper;
import net.silentclient.client.utils.HUDCaching;
import net.silentclient.client.utils.NotificationUtils;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
public class FPSBoostMod extends Mod {
@ -82,9 +97,42 @@ public class FPSBoostMod extends Mod {
this.addBooleanSetting("Check glError",this, false); // ready
this.addBooleanSetting("Do memory debug",this, true); // ready
EventManager.register(new HUDCaching());
FastTrig.init();
}
@EventTarget
public void onJoinWorldEvent(EntityJoinLevelEvent event) {
if(!Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Optimized Entity Movement").getValBoolean()) {
return;
}
Entity entity = event.getEntity();
if (entity instanceof EntityLiving) {
EntityLiving living = (EntityLiving)entity;
Iterator<EntityAITasks.EntityAITaskEntry> it = ((List<EntityAITasks.EntityAITaskEntry>) ((EntityAITasksExt) ((EntityLivingExt)((Object)living)).client$getTasks()).client$getTaskEntries()).iterator();
while (it.hasNext()) {
EntityAITasks.EntityAITaskEntry obj = it.next();
if (!(obj instanceof EntityAITasks.EntityAITaskEntry)) continue;
EntityAITasks.EntityAITaskEntry task = obj;
if (task.action instanceof EntityAIWatchClosest) {
it.remove();
continue;
}
if (!(task.action instanceof EntityAILookIdle)) continue;
it.remove();
}
if (living.getLookHelper() == null || living.getLookHelper().getClass() == EntityLookHelper.class) {
EntityLookHelper oldHelper = living.getLookHelper();
((EntityLivingExt)((Object)living)).client$setLookHelper(new FixedEntityLookHelper(living));
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setPosX(((EntityLookHelperAccessor)((Object)oldHelper)).getPosX());
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setPosY(((EntityLookHelperAccessor)((Object)oldHelper)).getPosY());
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setPosZ(((EntityLookHelperAccessor)((Object)oldHelper)).getPosZ());
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setLooking(((EntityLookHelperAccessor)((Object)oldHelper)).isLooking());
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setDeltaLookPitch(((EntityLookHelperAccessor)((Object)oldHelper)).getDeltaLookPitch());
((EntityLookHelperAccessor)((Object)living.getLookHelper())).setDeltaLookYaw(((EntityLookHelperAccessor)((Object)oldHelper)).getDeltaLookYaw());
}
}
}
public static boolean basicEnabled() {
return Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "FPS Boost").getValBoolean();

5
src/main/resources/mixins.SilentClient.json
View File

@ -4,6 +4,8 @@
"refmap": "mixins.SilentClient.refmap.json",
"mixins": [
"accessors.EntityArrowAccessor",
"accessors.EntityLivingAccessor",
"accessors.EntityLookHelperAccessor",
"accessors.FontRendererAccessor",
"accessors.GuiAccessor",
"accessors.GuiInGameAccessor",
@ -32,8 +34,11 @@
"mixins.ChunkRenderDispatcherMixin",
"mixins.CommandHandlerMixin",
"mixins.EffectRendererMixin",
"mixins.EntityAITasksMixin",
"mixins.EntityFXMixin",
"mixins.EntityLivingBaseMixin",
"mixins.EntityLivingMixin",
"mixins.EntityLookHelperMixin",
"mixins.EntityMixin",
"mixins.EntityOtherPlayerMPMixin",
"mixins.EntityPacketsMixin",

5
src/main/resources/silentclient_at.cfg
View File

@ -10,4 +10,7 @@ public net.minecraft.client.renderer.tileentity.TileEntityBannerRenderer$TimedBa
public net.minecraft.client.renderer.tileentity.TileEntityBannerRenderer$TimedBannerTexture <init>()V # constructor
# BlockRedstoneTorch
public net.minecraft.block.BlockRedstoneTorch$Toggle
public net.minecraft.block.BlockRedstoneTorch$Toggle
# EntityAITasks
public net.minecraft.entity.ai.EntityAITasks$EntityAITaskEntry