Skip to content
This repository was archived by the owner on Mar 11, 2023. It is now read-only.

Commit 3d35755

Browse files
0x41c0x41c
committed
[EntityLivingBase] Remove un-needed spacing
1 parent 5aa96c9 commit 3d35755

File tree

12 files changed

+183
-252
lines changed

12 files changed

+183
-252
lines changed

‎.idea/vcs.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/bin)
88
add_subdirectory(ClientLoader)
99
add_subdirectory(ClientInjector)
1010

11+
1112
# Deps
12-
#add_subdirectory(shared/dependencies/Zippy)
13+
add_subdirectory(shared/dependencies/jnif)
1314

1415
# Shared source files
1516
file(GLOB SharedSources CONFIGURE_DEPENDS
@@ -22,4 +23,9 @@ target_sources(ClientInjector PRIVATE ${SharedSources})
2223

2324
target_include_directories(ClientLoader PRIVATE shared/include)
2425
target_include_directories(ClientLoader PRIVATE shared/dependencies/Zippy/library)
25-
target_include_directories(ClientInjector PRIVATE shared/include)
26+
target_include_directories(ClientLoader PRIVATE shared/dependencies/jnif/src-libjnif)
27+
target_include_directories(ClientInjector PRIVATE shared/include)
28+
29+
#linking
30+
31+
target_link_libraries(ClientLoader PRIVATE jnif)

‎Client/.idea/workspace.xml

+36-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/src/java/com/cero/Client.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
import com.cero.sdk.client.entity.EntityPlayerSP;
66
import com.cero.utilities.ClientConstants;
77
import com.cero.utilities.Logger;
8-
import com.cero.utilities.runtime.Interface;
98

109
import java.io.File;
1110
import java.io.IOException;
1211
import java.io.InputStream;
12+
import java.lang.reflect.Field;
1313
import java.net.URL;
1414
import java.nio.charset.StandardCharsets;
15-
import java.util.List;
16-
import java.util.Map;
1715

1816
public class Client {
1917

@@ -54,7 +52,7 @@ public String getMCName() {
5452
Logger.info("Using lunar client.");
5553
String sep = File.separator;
5654
String jarPath = ClientConstants.lunarHomeDir
57-
+ sep + "offline" + sep + "1.8" + sep + "lunar-prod-optifine.jar";
55+
+ sep + "offline" + sep + "1.8.9" + sep + "lunar-prod-optifine.jar";
5856
String mappingFilePath = sep + "patch" + sep + "v1_8" + sep + "mappings.txt";
5957

6058
URL jarMappingsURL = null;
@@ -102,14 +100,17 @@ void getClassLoader() {
102100
void getMinecraft() {
103101
Logger.info("Getting minecraft");
104102
try {
105-
Object fakeInstance = mainClassLoader.loadClass(getMCName());
106-
Minecraft mc = new Minecraft(fakeInstance);
107-
108-
mc.loadFields(Map.ofEntries(
109-
Map.entry(Minecraft.Identifiers.MINECRAFT_INSTANCE, true)
110-
));
111-
112-
minecraft = mc.theMinecraft;
103+
Class<?> mcClazz = mainClassLoader.loadClass(getMCName());
104+
Field mcField = mcClazz.getDeclaredFields()[10];
105+
mcField.setAccessible(true);
106+
try {
107+
minecraft = new Minecraft(mcClazz, mcField.get(mcClazz));
108+
} catch (IllegalAccessException e) {
109+
e.printStackTrace();
110+
Logger.error("Couldn't get mc field: " + e.getMessage());
111+
}
112+
assert minecraft != null;
113+
minecraft.loadAllFields();
113114
} catch (ClassNotFoundException e) {
114115
e.printStackTrace();
115116
Logger.error("Couldn't get class: " + e.getMessage());
@@ -128,14 +129,13 @@ void clientLoop() {
128129
if (minecraft.inWorld()) {
129130
if (!printedEnter) {
130131
Logger.info("Entered world.");
131-
Logger.info("Minecraft field count: " + List.of(Minecraft.class.getDeclaredFields()).size());
132-
Logger.info("Interface field count" + List.of(Interface.class.getDeclaredFields()).size());
133132
printedEnter = true;
134133
}
135-
136134
EntityPlayerSP player = minecraft.thePlayer;
135+
player.loadAllFields();
137136

138137
if (player.maxHurtTime > 0 && player.hurtTime == player.maxHurtTime) {
138+
Logger.info("was hit");
139139
player.motionX *= 0.4;
140140
player.motionZ *= 0.4;
141141
}

‎Client/src/java/com/cero/sdk/client/Minecraft.java

+3-102
Original file line numberDiff line numberDiff line change
@@ -13,112 +13,13 @@
1313

1414
public class Minecraft extends Interface {
1515

16-
public Minecraft(@NotNull Object minecraft) throws ClassNotFoundException {
17-
super(Class.forName(Client.shared.getMCName()), minecraft);
18-
};
19-
2016
public Minecraft(@NotNull Class<?> type, @NotNull Object minecraft) {
2117
super(type, minecraft);
2218
}
2319

24-
public static class Identifiers {
25-
public final static String LOGGER = "logger";
26-
public final static String MOJANG_PNG_LOCATION = "location_mojang_png";
27-
public final static String IS_RUNNING_ON_MAC = "is_running_on_mac";
28-
public final static String MEMORY_RESERVE = "memory_reserve";
29-
public final static String MAC_DISPLAY_MODES = "mac_display_modes";
30-
public final static String FILE_RESOURCE_PACKS = "file_resource_packs";
31-
public final static String TWITCH_DETAILS = "twitch_details";
32-
public final static String PROFILE_PROPERTIES = "profile_properties";
33-
public final static String CURRENT_SERVER_DATA = "current_server_data";
34-
public final static String RENDER_ENGINE = "render_engine";
35-
public final static String MINECRAFT_INSTANCE = "the_minecraft";
36-
public final static String PLAYER_CONTROLLER = "player_controller";
37-
public final static String IS_FULLSCREEN = "is_fullscreen";
38-
public final static String ENABLE_GL_ERROR_TRACKING = "enable_gl_tracking";
39-
public final static String HAS_CRASHED = "has_crashed";
40-
public final static String CRASH_REPORTER = "crash_reporter";
41-
public final static String DISPLAY_WIDTH = "display_width";
42-
public final static String DISPLAY_HEIGHT = "display_height";
43-
public final static String CONNECTED_TO_REALMS = "connected_to_realms";
44-
public final static String GAME_TIMER = "game_timer";
45-
public final static String USAGE_SNOOPER = "usage_snooper";
46-
public final static String THE_WORLD = "the_world";
47-
public final static String RENDER_GLOBAL = "render_global";
48-
public final static String RENDER_MANAGER = "render_manager";
49-
public final static String RENDER_ITEM = "render_item";
50-
public final static String ITEM_RENDERER = "item_renderer";
51-
public final static String THE_PLAYER = "the_player";
52-
public final static String RENDER_VIEW_ENTITY = "render_view_entity";
53-
public final static String POINTED_ENTITY = "pointed_entity";
54-
public final static String EFFECT_RENDERER = "effect_renderer";
55-
public final static String SESSION = "session";
56-
public final static String IS_GAME_PAUSED = "is_game_paused";
57-
public final static String FONT_RENDERER = "font_renderer";
58-
public final static String STANDARD_GALACTIC_FONT_RENDERER = "standard_galactic_font_renderer";
59-
public final static String CURRENT_SCREEN = "current_screen";
60-
public final static String LOADING_SCREEN = "loading_screen";
61-
public final static String ENTITY_RENDERER = "entity_renderer";
62-
public final static String LEFT_CLICK_COUNTER = "left_click_counter";
63-
public final static String TEMP_DISPLAY_WIDTH = "temp_display_width";
64-
public final static String TEMP_DISPLAY_HEIGHT = "temp_display_height";
65-
public final static String THE_INTEGRATED_SERVER = "the_integrated_server";
66-
public final static String GUI_ACHIEVEMENT = "gui_achievement";
67-
public final static String IN_GAME_GUI = "in_game_gui";
68-
public final static String SKIP_RENDER_WORLD = "skip_render_world";
69-
public final static String OBJECT_MOUSE_OVER = "object_mouse_over";
70-
public final static String GAME_SETTINGS = "game_settings";
71-
public final static String MOUSE_HELPER = "mouse_helper";
72-
public final static String MC_DATA_DIR = "mc_data_dir";
73-
public final static String FILE_ASSETS = "file_assets";
74-
public final static String LAUNCHED_VERSION = "launched_version";
75-
public final static String PROXY = "proxy";
76-
public final static String SAVE_LOADER = "save_loader";
77-
public final static String DEBUG_FPS = "debug_fps";
78-
public final static String RIGHT_CLICK_DELAY_TIMER = "right_click_delay_timer";
79-
public final static String SERVER_NAME = "server_name";
80-
public final static String SERVER_PORT = "server_port";
81-
public final static String IN_GAME_HAS_FOCUS = "in_game_has_focus";
82-
public final static String SYSTEM_TIME = "system_time";
83-
public final static String JOIN_PLAYER_COUNTER = "join_player_counter";
84-
public final static String FRAME_TIMER = "frame_timer";
85-
public final static String START_NANO_TIME = "start_nano_time";
86-
public final static String JVM_64_BIT = "jvm_64_bit";
87-
public final static String IS_DEMO = "is_demo";
88-
public final static String MY_NETWORK_MANAGER = "my_network_manager";
89-
public final static String INTEGRATED_SERVER_IS_RUNNING = "integrated_server_is_running";
90-
public final static String MC_PROFILER = "mc_profiler";
91-
public final static String DEBUG_CRASH_KEY_PRESS_TIME = "debug_crash_key_press_time";
92-
public final static String MC_RESOURCE_MANAGER = "mc_resource_manager";
93-
public final static String METADATA_SERIALIZER = "metadata_serializer";
94-
public final static String DEFAULT_RESOURCE_PACKS = "default_resource_packs";
95-
public final static String MC_DEFAULT_RESOURCE_PACK = "mc_default_resource_pack";
96-
public final static String MC_RESOURCE_PACK_REPOSITORY = "mc_resource_pack_repository";
97-
public final static String MC_LANGUAGE_MANAGER = "mc_language_manager";
98-
public final static String STREAM = "stream";
99-
public final static String FRAME_BUFFER_MC = "frame_buffer_mc";
100-
public final static String TEXTURE_MAP_BLOCKS = "texture_map_blocks";
101-
public final static String MC_SOUND_HANDLER = "mc_sound_handler";
102-
public final static String MC_MUSIC_TICKER = "mc_music_ticker";
103-
public final static String MOJANG_LOGO = "mojang_logo";
104-
public final static String SESSION_SERVICE = "session_service";
105-
public final static String SKIN_MANAGER = "skin_manager";
106-
public final static String SCHEDULED_TASKS = "scheduled_tasks";
107-
public final static String UNNAMED_1 = "unnamed_1";
108-
public final static String MC_THREAD = "mc_thread";
109-
public final static String MODULE_MANAGER = "model_manager";
110-
public final static String BLOCK_RENDER_DISPATCHER = "block_render_dispatcher";
111-
public final static String RUNNING = "running";
112-
public final static String DEBUG = "debug";
113-
public final static String UNNAMED_2 = "unnamed_2";
114-
public final static String UNNAMED_3 = "unnamed_3";
115-
public final static String UNNAMED_4 = "unnamed_4";
116-
public final static String RENDER_CHUNKS_MANY = "render_chunks_many";
117-
public final static String DEBUG_UPDATE_TIME = "debug_update_time";
118-
public final static String FPS_COUNTER = "fps_counter";
119-
public final static String PREVIOUS_FRAME_TIME = "previous_frame_time";
120-
public final static String DEBUG_PROFILER_NAME = "debug_profiler_name";
121-
}
20+
public Minecraft(@NotNull Object minecraft) throws ClassNotFoundException {
21+
super(Class.forName(Client.shared.getMCName()), minecraft);
22+
};
12223

12324
public Object logger;
12425
public Object mojangPngLocation;

‎Client/src/java/com/cero/sdk/client/entity/AbstractClientPlayer.java

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ public AbstractClientPlayer(@NotNull Class<?> type, @NotNull Object entity) {
99
}
1010

1111
public Object playerInfo;
12+
public Object locationOfCape;
13+
public long reloadCapeMS;
14+
public boolean elytraOfCape;
15+
public String nameClear;
16+
public Object elytraTexture;
1217
}

‎Client/src/java/com/cero/sdk/client/entity/EntityPlayerSP.java

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public EntityPlayerSP(@NotNull Class<?> type, @NotNull Object entity) {
1313
public double lastReportedPosX;
1414
public double lastReportedPosY;
1515
public double lastReportedPosZ;
16+
public float lastReportedYaw;
1617
public float lastReportedPitch;
1718
public boolean serverSneakState;
1819
public boolean serverSprintState;

‎Client/src/java/com/cero/sdk/entity/Entity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ public class Entity extends Interface {
5050
public float prevDistanceWalkedModified;
5151
public float distanceWalkedModified;
5252
public float distanceWalkedOnStepModified;
53+
public float fallDistance;
5354
public int nextStepDistance;
5455
public double lastTickPosX;
5556
public double lastTickPosY;
5657
public double lastTickPosZ;
5758
public float stepHeight;
58-
public float noClip;
59+
public boolean noClip;
5960
public float entityCollisionReduction;
6061
public Random rand;
6162
public int ticksExisted;

0 commit comments

Comments
 (0)