Skip to content

Commit

Permalink
10pre5
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrbudda
jrbudda committed May 27, 2017
1 parent a80faa8 commit fb9f1a4
Show file tree
Hide file tree
Showing 17 changed files with 688 additions and 299 deletions.
2 changes: 1 addition & 1 deletion minecriftversion.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
of_json_name = "1.10.2_HD_U_D8"
of_file_md5 = "d2a99a8d96d1067cb9e384bbdc560c70"
minecrift_version_num = "1.10.2"
minecrift_build = "jrbudda-10pre2"
minecrift_build = "jrbudda-10pre5"
of_file_extension = ".jar"
mcp_version = "mcp931"
mcp_uses_generics = True
Expand Down
81 changes: 54 additions & 27 deletions patches/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
+ * The minecriftVerString will be automatically updated by the build scripts, do not modify here.
+ * Modify minecriftversion.py in root minecrift dir.
+ */
+ public final String minecriftVerString = "Vivecraft 1.10.2 jrbudda-10pre2";
+ public final String minecriftVerString = "Vivecraft 1.10.2 jrbudda-10pre5";
+ /* end version */
+ /** END MINECRIFT */
+
Expand Down Expand Up @@ -1151,7 +1151,7 @@
- this.debugUpdateTime += 1000L;
- this.fpsCounter = 0;
- this.usageSnooper.addMemoryStatsToSnooper();
-
- if (!this.usageSnooper.isSnooperRunning())
- {
- this.usageSnooper.startSnooper();
Expand All @@ -1164,7 +1164,7 @@
- Display.sync(this.getLimitFramerate());
- this.mcProfiler.endSection();
- }
-
- this.mcProfiler.endSection();
+ this.debugUpdateTime += 1000L;
+ this.fpsCounter = 0;
Expand Down Expand Up @@ -1672,7 +1672,7 @@
while (this.gameSettings.keyBindInventory.isPressed())
{
this.getConnection().sendPacket(new CPacketClientStatus(CPacketClientStatus.State.OPEN_INVENTORY_ACHIEVEMENT));
@@ -2242,11 +2882,26 @@
@@ -2242,22 +2882,42 @@

if (flag)
{
Expand Down Expand Up @@ -1704,8 +1704,13 @@
if (this.currentScreen == null && this.gameSettings.keyBindCommand.isPressed())
{
this.displayGuiScreen(new GuiChat("/"));
@@ -2255,9 +2910,10 @@
}
}

+ boolean nope = false;
+ if(climbTracker.isClimbeyClimb() && (this.objectMouseOver==null || this.objectMouseOver.entityHit==null)) nope = true;
+
+
if (this.player.isHandActive())
{
- if (!this.gameSettings.keyBindUseItem.isKeyDown())
Expand All @@ -1717,7 +1722,7 @@
}

label472:
@@ -2283,17 +2939,30 @@
@@ -2283,17 +2943,27 @@
}
}
}
Expand All @@ -1728,12 +1733,10 @@
- {
- this.clickMouse();
- }
+ boolean nope = false;
+ if(climbTracker.isClimbeyClimb() && (this.objectMouseOver==null || this.objectMouseOver.entityHit==null)) nope = true;

-
- while (this.gameSettings.keyBindUseItem.isPressed())
+ //VIVE SUPPORT HAND SWINGING
+ if (!nope && this.gameSettings.keyBindAttack.isKeyDown() && currentScreen == null)
+ //VIVE SUPPORT HAND SWINGING
+ if (!nope && this.gameSettings.keyBindAttack.isPressed() && currentScreen == null)
+ {
+ this.clickMouse();
+ lastClick = true;
Expand All @@ -1755,7 +1758,7 @@

while (this.gameSettings.keyBindPickBlock.isPressed())
{
@@ -2301,18 +2970,23 @@
@@ -2301,18 +2971,23 @@
}
}

Expand All @@ -1767,7 +1770,7 @@
}

- this.sendClickBlockToController(this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
+ //this.sendClickBlockToController(this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
+ if(!nope) this.sendClickBlockToController(this.currentScreen == null && this.gameSettings.keyBindAttack.isKeyDown() && this.inGameHasFocus);
}

private void runTickMouse() throws IOException
Expand All @@ -1782,7 +1785,7 @@
int i = Mouse.getEventButton();
KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());

@@ -2327,6 +3001,13 @@
@@ -2327,6 +3002,13 @@
KeyBinding.onTick(i - 100);
}
}
Expand All @@ -1796,7 +1799,7 @@

long j = getSystemTime() - this.systemTime;

@@ -2381,6 +3062,15 @@
@@ -2381,6 +3063,15 @@
*/
public void launchIntegratedServer(String folderName, String worldName, @Nullable WorldSettings worldSettingsIn)
{
Expand All @@ -1812,7 +1815,7 @@
this.loadWorld((WorldClient)null);
System.gc();
ISaveHandler isavehandler = this.saveLoader.getSaveLoader(folderName, false);
@@ -2423,6 +3113,16 @@
@@ -2423,6 +3114,16 @@

while (!this.theIntegratedServer.serverIsInRunLoop())
{
Expand All @@ -1829,7 +1832,7 @@
String s = this.theIntegratedServer.getUserMessage();

if (s != null)
@@ -2443,12 +3143,19 @@
@@ -2443,12 +3144,19 @@
;
}
}
Expand All @@ -1851,7 +1854,7 @@
networkmanager.sendPacket(new CPacketLoginStart(this.getSession().getProfile()));
this.myNetworkManager = networkmanager;
}
@@ -2458,6 +3165,9 @@
@@ -2458,6 +3166,9 @@
*/
public void loadWorld(WorldClient worldClientIn)
{
Expand All @@ -1861,7 +1864,7 @@
this.loadWorld(worldClientIn, "");
}

@@ -2466,6 +3176,11 @@
@@ -2466,6 +3177,11 @@
*/
public void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage)
{
Expand All @@ -1873,7 +1876,7 @@
if (worldClientIn == null)
{
NetHandlerPlayClient nethandlerplayclient = this.getConnection();
@@ -2477,9 +3192,25 @@
@@ -2477,9 +3193,25 @@

if (this.theIntegratedServer != null && this.theIntegratedServer.isAnvilFileSet())
{
Expand Down Expand Up @@ -1901,7 +1904,7 @@
this.theIntegratedServer = null;
this.guiAchievement.clearAchievements();
this.entityRenderer.getMapItemRenderer().clearLoadedMaps();
@@ -2501,6 +3232,11 @@
@@ -2501,6 +3233,11 @@
this.ingameGUI.resetPlayersOverlayFooterHeader();
this.setServerData((ServerData)null);
this.integratedServerIsRunning = false;
Expand All @@ -1913,15 +1916,39 @@
}

this.mcSoundHandler.stopSounds();
@@ -2607,6 +3343,7 @@
@@ -2533,12 +3270,14 @@

if (this.player == null)
{
+ System.out.println("player is null"); //debug spawning in the damn ground.
this.player = this.playerController.createClientPlayer(worldClientIn, new StatisticsManager());
this.playerController.flipPlayer(this.player);
}
-
+ System.out.println("PreLoadSpawned Player At " + this.player.posX + " " + this.player.posY + " " + this.player.posZ); //debug spawning in the damn ground.
this.player.preparePlayerToSpawn();
worldClientIn.spawnEntity(this.player);
+ System.out.println("LoadSpawned Player At " + this.player.posX + " " + this.player.posY + " " + this.player.posZ); //debug spawning in the damn ground.
this.player.movementInput = new MovementInputFromOptions(this.gameSettings);
this.playerController.setPlayerCapabilities(this.player);
this.renderViewEntity = this.player;
@@ -2576,6 +3315,7 @@
this.player.preparePlayerToSpawn();
this.player.setServerBrand(s);
this.world.spawnEntity(this.player);
+ System.out.println("Spawned Player At " + this.player.posX + " " + this.player.posY + " " + this.player.posZ); //debug spawning in the damn ground.
this.playerController.flipPlayer(this.player);
this.player.movementInput = new MovementInputFromOptions(this.gameSettings);
this.player.setEntityId(i);
@@ -2607,6 +3347,7 @@
return theMinecraft == null || !theMinecraft.gameSettings.hideGUI;
}

+ //unused
public static boolean isFancyGraphicsEnabled()
{
return theMinecraft != null && theMinecraft.gameSettings.fancyGraphics;
@@ -2623,8 +3360,16 @@
@@ -2623,8 +3364,16 @@
/**
* Called when user clicked he's mouse middle button (pick block)
*/
Expand All @@ -1939,7 +1966,7 @@
if (this.objectMouseOver != null && this.objectMouseOver.typeOfHit != RayTraceResult.Type.MISS)
{
boolean flag = this.player.capabilities.isCreativeMode;
@@ -2788,7 +3533,8 @@
@@ -2788,7 +3537,8 @@
}
}

Expand All @@ -1949,7 +1976,7 @@
{
NBTTagCompound nbttagcompound = te.writeToNBT(new NBTTagCompound());

@@ -3098,6 +3844,11 @@
@@ -3098,6 +3848,11 @@
*/
public static int getGLMaximumTextureSize()
{
Expand All @@ -1961,7 +1988,7 @@
for (int i = 16384; i > 0; i >>= 1)
{
GlStateManager.glTexImage2D(32868, 0, 6408, i, i, 0, 6408, 5121, (IntBuffer)null);
@@ -3264,7 +4015,7 @@
@@ -3264,7 +4019,7 @@
}

public void dispatchKeypresses()
Expand All @@ -1970,7 +1997,7 @@
int i = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey();

if (i != 0 && !Keyboard.isRepeatEvent())
@@ -3417,4 +4168,1209 @@
@@ -3417,4 +4172,1209 @@
{
return this.player != null && this.player.hasReducedDebug() || this.gameSettings.reducedDebugInfo;
}
Expand Down
Loading

0 comments on commit fb9f1a4

Please sign in to comment.