diff --git a/build/classes/java/main/net/minecraft/src/ActiveRenderInfo.class b/build/classes/java/main/net/minecraft/src/ActiveRenderInfo.class index 4da485a..5b8055b 100644 Binary files a/build/classes/java/main/net/minecraft/src/ActiveRenderInfo.class and b/build/classes/java/main/net/minecraft/src/ActiveRenderInfo.class differ diff --git a/build/classes/java/main/net/minecraft/src/CallableGLInfo.class b/build/classes/java/main/net/minecraft/src/CallableGLInfo.class index fb51b25..10d2e3c 100644 Binary files a/build/classes/java/main/net/minecraft/src/CallableGLInfo.class and b/build/classes/java/main/net/minecraft/src/CallableGLInfo.class differ diff --git a/build/classes/java/main/net/minecraft/src/ClippingHelperImpl.class b/build/classes/java/main/net/minecraft/src/ClippingHelperImpl.class index 7713a55..f584ef8 100644 Binary files a/build/classes/java/main/net/minecraft/src/ClippingHelperImpl.class and b/build/classes/java/main/net/minecraft/src/ClippingHelperImpl.class differ diff --git a/build/classes/java/main/net/minecraft/src/EffectRenderer.class b/build/classes/java/main/net/minecraft/src/EffectRenderer.class index 1226026..593f5be 100644 Binary files a/build/classes/java/main/net/minecraft/src/EffectRenderer.class and b/build/classes/java/main/net/minecraft/src/EffectRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFootStepFX.class b/build/classes/java/main/net/minecraft/src/EntityFootStepFX.class index e67df5e..084ee44 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFootStepFX.class and b/build/classes/java/main/net/minecraft/src/EntityFootStepFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class b/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class index 3a4b004..147db04 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class and b/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPickupFX.class b/build/classes/java/main/net/minecraft/src/EntityPickupFX.class index 52d1755..bfc5446 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPickupFX.class and b/build/classes/java/main/net/minecraft/src/EntityPickupFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiAchievement.class b/build/classes/java/main/net/minecraft/src/GuiAchievement.class index bcf4e2d..7da84e2 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiAchievement.class and b/build/classes/java/main/net/minecraft/src/GuiAchievement.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiAchievements.class b/build/classes/java/main/net/minecraft/src/GuiAchievements.class index bd4c94d..f734e83 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiAchievements.class and b/build/classes/java/main/net/minecraft/src/GuiAchievements.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiBeacon.class b/build/classes/java/main/net/minecraft/src/GuiBeacon.class index 604348e..486749f 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiBeacon.class and b/build/classes/java/main/net/minecraft/src/GuiBeacon.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiBeaconButton.class b/build/classes/java/main/net/minecraft/src/GuiBeaconButton.class index 0d9d30f..fa49173 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiBeaconButton.class and b/build/classes/java/main/net/minecraft/src/GuiBeaconButton.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiBrewingStand.class b/build/classes/java/main/net/minecraft/src/GuiBrewingStand.class index 2b8c7ee..dfd594d 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiBrewingStand.class and b/build/classes/java/main/net/minecraft/src/GuiBrewingStand.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiButtonLanguage.class b/build/classes/java/main/net/minecraft/src/GuiButtonLanguage.class index 4ff774f..b177639 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiButtonLanguage.class and b/build/classes/java/main/net/minecraft/src/GuiButtonLanguage.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiButtonMerchant.class b/build/classes/java/main/net/minecraft/src/GuiButtonMerchant.class index ee949c3..b39e2dc 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiButtonMerchant.class and b/build/classes/java/main/net/minecraft/src/GuiButtonMerchant.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiButtonNextPage.class b/build/classes/java/main/net/minecraft/src/GuiButtonNextPage.class index 6edb7a6..a18b4db 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiButtonNextPage.class and b/build/classes/java/main/net/minecraft/src/GuiButtonNextPage.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiChest.class b/build/classes/java/main/net/minecraft/src/GuiChest.class index 638e3b7..a195e8c 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiChest.class and b/build/classes/java/main/net/minecraft/src/GuiChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiContainer.class b/build/classes/java/main/net/minecraft/src/GuiContainer.class index faed06e..0fb3e0d 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiContainer.class and b/build/classes/java/main/net/minecraft/src/GuiContainer.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiContainerCreative.class b/build/classes/java/main/net/minecraft/src/GuiContainerCreative.class index 6bff0482..235c43c 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiContainerCreative.class and b/build/classes/java/main/net/minecraft/src/GuiContainerCreative.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiCrafting.class b/build/classes/java/main/net/minecraft/src/GuiCrafting.class index 1509264..b44457c 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiCrafting.class and b/build/classes/java/main/net/minecraft/src/GuiCrafting.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiCreateFlatWorldListSlot.class b/build/classes/java/main/net/minecraft/src/GuiCreateFlatWorldListSlot.class index 25381b9..b90ef2f 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiCreateFlatWorldListSlot.class and b/build/classes/java/main/net/minecraft/src/GuiCreateFlatWorldListSlot.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiDispenser.class b/build/classes/java/main/net/minecraft/src/GuiDispenser.class index 3172875..8aa7d86 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiDispenser.class and b/build/classes/java/main/net/minecraft/src/GuiDispenser.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiEditSign.class b/build/classes/java/main/net/minecraft/src/GuiEditSign.class index a0185b1..e22b8e4 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiEditSign.class and b/build/classes/java/main/net/minecraft/src/GuiEditSign.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiEnchantment.class b/build/classes/java/main/net/minecraft/src/GuiEnchantment.class index bb4b45f..0e1f8ec 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiEnchantment.class and b/build/classes/java/main/net/minecraft/src/GuiEnchantment.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiFlatPresetsListSlot.class b/build/classes/java/main/net/minecraft/src/GuiFlatPresetsListSlot.class index 99e73ee..05a9a19 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiFlatPresetsListSlot.class and b/build/classes/java/main/net/minecraft/src/GuiFlatPresetsListSlot.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiFurnace.class b/build/classes/java/main/net/minecraft/src/GuiFurnace.class index 7116f1f..0b3e526 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiFurnace.class and b/build/classes/java/main/net/minecraft/src/GuiFurnace.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiGameOver.class b/build/classes/java/main/net/minecraft/src/GuiGameOver.class index a896634..ef86f68 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiGameOver.class and b/build/classes/java/main/net/minecraft/src/GuiGameOver.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiHopper.class b/build/classes/java/main/net/minecraft/src/GuiHopper.class index 9b6d219..3b4a50f 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiHopper.class and b/build/classes/java/main/net/minecraft/src/GuiHopper.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiIngame.class b/build/classes/java/main/net/minecraft/src/GuiIngame.class index b0898ae..dcd3fce 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiIngame.class and b/build/classes/java/main/net/minecraft/src/GuiIngame.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiInventory.class b/build/classes/java/main/net/minecraft/src/GuiInventory.class index 152989e..235eebe 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiInventory.class and b/build/classes/java/main/net/minecraft/src/GuiInventory.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiMerchant.class b/build/classes/java/main/net/minecraft/src/GuiMerchant.class index 54c1387..871c825 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiMerchant.class and b/build/classes/java/main/net/minecraft/src/GuiMerchant.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiNewChat.class b/build/classes/java/main/net/minecraft/src/GuiNewChat.class index 427f04f..0c0b100 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiNewChat.class and b/build/classes/java/main/net/minecraft/src/GuiNewChat.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiRepair.class b/build/classes/java/main/net/minecraft/src/GuiRepair.class index 4796c2a..59e5ed7 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiRepair.class and b/build/classes/java/main/net/minecraft/src/GuiRepair.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiScreenBook.class b/build/classes/java/main/net/minecraft/src/GuiScreenBook.class index 4061576..3ce5501 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiScreenBook.class and b/build/classes/java/main/net/minecraft/src/GuiScreenBook.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiScreenHorseInventory.class b/build/classes/java/main/net/minecraft/src/GuiScreenHorseInventory.class index 8ea0c57..d14e3a6 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiScreenHorseInventory.class and b/build/classes/java/main/net/minecraft/src/GuiScreenHorseInventory.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiScreenSelectLocation.class b/build/classes/java/main/net/minecraft/src/GuiScreenSelectLocation.class index 6cbcd76..211b84c 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiScreenSelectLocation.class and b/build/classes/java/main/net/minecraft/src/GuiScreenSelectLocation.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiSlider.class b/build/classes/java/main/net/minecraft/src/GuiSlider.class index d3f8dc3..c965134 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiSlider.class and b/build/classes/java/main/net/minecraft/src/GuiSlider.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiSlot.class b/build/classes/java/main/net/minecraft/src/GuiSlot.class index 83b2a43..5aa0487 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiSlot.class and b/build/classes/java/main/net/minecraft/src/GuiSlot.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiStats.class b/build/classes/java/main/net/minecraft/src/GuiStats.class index 060d32f..8881d24 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiStats.class and b/build/classes/java/main/net/minecraft/src/GuiStats.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiTextField.class b/build/classes/java/main/net/minecraft/src/GuiTextField.class index da64ccf..394722c 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiTextField.class and b/build/classes/java/main/net/minecraft/src/GuiTextField.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiWinGame.class b/build/classes/java/main/net/minecraft/src/GuiWinGame.class index 56fdf1e..dc80da8 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiWinGame.class and b/build/classes/java/main/net/minecraft/src/GuiWinGame.class differ diff --git a/build/classes/java/main/net/minecraft/src/InventoryEffectRenderer.class b/build/classes/java/main/net/minecraft/src/InventoryEffectRenderer.class index efcd85f..39bf6bd 100644 Binary files a/build/classes/java/main/net/minecraft/src/InventoryEffectRenderer.class and b/build/classes/java/main/net/minecraft/src/InventoryEffectRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemRenderer.class b/build/classes/java/main/net/minecraft/src/ItemRenderer.class index 669d7ce..e067b50 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemRenderer.class and b/build/classes/java/main/net/minecraft/src/ItemRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/LoadingScreenRenderer.class b/build/classes/java/main/net/minecraft/src/LoadingScreenRenderer.class index 61f8770..7cd893a 100644 Binary files a/build/classes/java/main/net/minecraft/src/LoadingScreenRenderer.class and b/build/classes/java/main/net/minecraft/src/LoadingScreenRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/Minecraft.class b/build/classes/java/main/net/minecraft/src/Minecraft.class index fb95513..b72a302 100644 Binary files a/build/classes/java/main/net/minecraft/src/Minecraft.class and b/build/classes/java/main/net/minecraft/src/Minecraft.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelBiped.class b/build/classes/java/main/net/minecraft/src/ModelBiped.class index 155c49f..ea601ad 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelBiped.class and b/build/classes/java/main/net/minecraft/src/ModelBiped.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelChicken.class b/build/classes/java/main/net/minecraft/src/ModelChicken.class index 645d237..29813ab 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelChicken.class and b/build/classes/java/main/net/minecraft/src/ModelChicken.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelDragon.class b/build/classes/java/main/net/minecraft/src/ModelDragon.class index ff69a60..b8cb4e6 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelDragon.class and b/build/classes/java/main/net/minecraft/src/ModelDragon.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelEnderCrystal.class b/build/classes/java/main/net/minecraft/src/ModelEnderCrystal.class index 12a3916..98a6e91 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelEnderCrystal.class and b/build/classes/java/main/net/minecraft/src/ModelEnderCrystal.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelGhast.class b/build/classes/java/main/net/minecraft/src/ModelGhast.class index 382b042..a9118f2 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelGhast.class and b/build/classes/java/main/net/minecraft/src/ModelGhast.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelHorse.class b/build/classes/java/main/net/minecraft/src/ModelHorse.class index 819e614..c415577 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelHorse.class and b/build/classes/java/main/net/minecraft/src/ModelHorse.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelOcelot.class b/build/classes/java/main/net/minecraft/src/ModelOcelot.class index ab7ecd0..d77f2f5 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelOcelot.class and b/build/classes/java/main/net/minecraft/src/ModelOcelot.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelQuadruped.class b/build/classes/java/main/net/minecraft/src/ModelQuadruped.class index 8807745..46aeb27 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelQuadruped.class and b/build/classes/java/main/net/minecraft/src/ModelQuadruped.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelRenderer.class b/build/classes/java/main/net/minecraft/src/ModelRenderer.class index e887632..2c338fa 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelRenderer.class and b/build/classes/java/main/net/minecraft/src/ModelRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelWolf.class b/build/classes/java/main/net/minecraft/src/ModelWolf.class index 8dd37b9..66c2cc5 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelWolf.class and b/build/classes/java/main/net/minecraft/src/ModelWolf.class differ diff --git a/build/classes/java/main/net/minecraft/src/Render.class b/build/classes/java/main/net/minecraft/src/Render.class index 302128d..261c510 100644 Binary files a/build/classes/java/main/net/minecraft/src/Render.class and b/build/classes/java/main/net/minecraft/src/Render.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderArrow.class b/build/classes/java/main/net/minecraft/src/RenderArrow.class index e143e83..6d5cdc1 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderArrow.class and b/build/classes/java/main/net/minecraft/src/RenderArrow.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderBat.class b/build/classes/java/main/net/minecraft/src/RenderBat.class index b8eec3f..6bd7e14 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderBat.class and b/build/classes/java/main/net/minecraft/src/RenderBat.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderBiped.class b/build/classes/java/main/net/minecraft/src/RenderBiped.class index 5c5dc76..ef29a41 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderBiped.class and b/build/classes/java/main/net/minecraft/src/RenderBiped.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderBlocks.class b/build/classes/java/main/net/minecraft/src/RenderBlocks.class index b6bcb82..4b366de 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderBlocks.class and b/build/classes/java/main/net/minecraft/src/RenderBlocks.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderBoat.class b/build/classes/java/main/net/minecraft/src/RenderBoat.class index 0e2b4b0..02c3a24 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderBoat.class and b/build/classes/java/main/net/minecraft/src/RenderBoat.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderCaveSpider.class b/build/classes/java/main/net/minecraft/src/RenderCaveSpider.class index 454d238..bb3d561 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderCaveSpider.class and b/build/classes/java/main/net/minecraft/src/RenderCaveSpider.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderCreeper.class b/build/classes/java/main/net/minecraft/src/RenderCreeper.class index a48de9b..59f98e7 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderCreeper.class and b/build/classes/java/main/net/minecraft/src/RenderCreeper.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderDragon.class b/build/classes/java/main/net/minecraft/src/RenderDragon.class index 2417e9c..c3d66d4 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderDragon.class and b/build/classes/java/main/net/minecraft/src/RenderDragon.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEnchantmentTable.class b/build/classes/java/main/net/minecraft/src/RenderEnchantmentTable.class index f5cfe75..30ada45 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEnchantmentTable.class and b/build/classes/java/main/net/minecraft/src/RenderEnchantmentTable.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEndPortal.class b/build/classes/java/main/net/minecraft/src/RenderEndPortal.class index d27be25..a7511b9 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEndPortal.class and b/build/classes/java/main/net/minecraft/src/RenderEndPortal.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEnderCrystal.class b/build/classes/java/main/net/minecraft/src/RenderEnderCrystal.class index 0808984..9c1e24a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEnderCrystal.class and b/build/classes/java/main/net/minecraft/src/RenderEnderCrystal.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEnderman.class b/build/classes/java/main/net/minecraft/src/RenderEnderman.class index 4190311..26b7168 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEnderman.class and b/build/classes/java/main/net/minecraft/src/RenderEnderman.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEntity.class b/build/classes/java/main/net/minecraft/src/RenderEntity.class index b416001..1798b5b 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEntity.class and b/build/classes/java/main/net/minecraft/src/RenderEntity.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderFallingSand.class b/build/classes/java/main/net/minecraft/src/RenderFallingSand.class index 2b991f1..c8239f1 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderFallingSand.class and b/build/classes/java/main/net/minecraft/src/RenderFallingSand.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderFireball.class b/build/classes/java/main/net/minecraft/src/RenderFireball.class index bfcb979..65d49ad 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderFireball.class and b/build/classes/java/main/net/minecraft/src/RenderFireball.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderFish.class b/build/classes/java/main/net/minecraft/src/RenderFish.class index cb6c7f9..26dbd1f 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderFish.class and b/build/classes/java/main/net/minecraft/src/RenderFish.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderGhast.class b/build/classes/java/main/net/minecraft/src/RenderGhast.class index e1c9e9f..2b744c6 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderGhast.class and b/build/classes/java/main/net/minecraft/src/RenderGhast.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderGiantZombie.class b/build/classes/java/main/net/minecraft/src/RenderGiantZombie.class index 7a72013..33b008a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderGiantZombie.class and b/build/classes/java/main/net/minecraft/src/RenderGiantZombie.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderHorse.class b/build/classes/java/main/net/minecraft/src/RenderHorse.class index 3dff660..405ed9a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderHorse.class and b/build/classes/java/main/net/minecraft/src/RenderHorse.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderIronGolem.class b/build/classes/java/main/net/minecraft/src/RenderIronGolem.class index b1c201e..1a08a5e 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderIronGolem.class and b/build/classes/java/main/net/minecraft/src/RenderIronGolem.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderItem.class b/build/classes/java/main/net/minecraft/src/RenderItem.class index 54c5440..d129c6f 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderItem.class and b/build/classes/java/main/net/minecraft/src/RenderItem.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderItemFrame.class b/build/classes/java/main/net/minecraft/src/RenderItemFrame.class index df155d6..39e9a3a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderItemFrame.class and b/build/classes/java/main/net/minecraft/src/RenderItemFrame.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderLeashKnot.class b/build/classes/java/main/net/minecraft/src/RenderLeashKnot.class index 7c95353..b28ebd4 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderLeashKnot.class and b/build/classes/java/main/net/minecraft/src/RenderLeashKnot.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class b/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class index 678aa94..e865e0d 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class and b/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderList.class b/build/classes/java/main/net/minecraft/src/RenderList.class index 362c47c..8872e2f 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderList.class and b/build/classes/java/main/net/minecraft/src/RenderList.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderLiving.class b/build/classes/java/main/net/minecraft/src/RenderLiving.class index 8292fe4..34c1552 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderLiving.class and b/build/classes/java/main/net/minecraft/src/RenderLiving.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderMagmaCube.class b/build/classes/java/main/net/minecraft/src/RenderMagmaCube.class index e3296e0..07283d5 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderMagmaCube.class and b/build/classes/java/main/net/minecraft/src/RenderMagmaCube.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderManager.class b/build/classes/java/main/net/minecraft/src/RenderManager.class index 7de14f1..7f9898b 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderManager.class and b/build/classes/java/main/net/minecraft/src/RenderManager.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderMinecart.class b/build/classes/java/main/net/minecraft/src/RenderMinecart.class index 933aa2b..5d7faf4 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderMinecart.class and b/build/classes/java/main/net/minecraft/src/RenderMinecart.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderMooshroom.class b/build/classes/java/main/net/minecraft/src/RenderMooshroom.class index b892787..4ab0f9e 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderMooshroom.class and b/build/classes/java/main/net/minecraft/src/RenderMooshroom.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderOcelot.class b/build/classes/java/main/net/minecraft/src/RenderOcelot.class index c406489..7e29a27 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderOcelot.class and b/build/classes/java/main/net/minecraft/src/RenderOcelot.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderPainting.class b/build/classes/java/main/net/minecraft/src/RenderPainting.class index f1f8e28..962cb7a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderPainting.class and b/build/classes/java/main/net/minecraft/src/RenderPainting.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderPlayer.class b/build/classes/java/main/net/minecraft/src/RenderPlayer.class index 8606fdc..9a9179f 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderPlayer.class and b/build/classes/java/main/net/minecraft/src/RenderPlayer.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSheep.class b/build/classes/java/main/net/minecraft/src/RenderSheep.class index 6ebeaa7..77d415d 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSheep.class and b/build/classes/java/main/net/minecraft/src/RenderSheep.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSkeleton.class b/build/classes/java/main/net/minecraft/src/RenderSkeleton.class index 785bfe0..2208b73 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSkeleton.class and b/build/classes/java/main/net/minecraft/src/RenderSkeleton.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSlime.class b/build/classes/java/main/net/minecraft/src/RenderSlime.class index d7e77eb..44e4c8f 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSlime.class and b/build/classes/java/main/net/minecraft/src/RenderSlime.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSnowMan.class b/build/classes/java/main/net/minecraft/src/RenderSnowMan.class index 9542c13..aff3c43 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSnowMan.class and b/build/classes/java/main/net/minecraft/src/RenderSnowMan.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSnowball.class b/build/classes/java/main/net/minecraft/src/RenderSnowball.class index 2783e2e..f4faf03 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSnowball.class and b/build/classes/java/main/net/minecraft/src/RenderSnowball.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSpider.class b/build/classes/java/main/net/minecraft/src/RenderSpider.class index 35e1aff..b6f2b72 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSpider.class and b/build/classes/java/main/net/minecraft/src/RenderSpider.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderSquid.class b/build/classes/java/main/net/minecraft/src/RenderSquid.class index f722176..09cd05e 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderSquid.class and b/build/classes/java/main/net/minecraft/src/RenderSquid.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderTNTPrimed.class b/build/classes/java/main/net/minecraft/src/RenderTNTPrimed.class index dec1f5f..dc6279c 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderTNTPrimed.class and b/build/classes/java/main/net/minecraft/src/RenderTNTPrimed.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderTntMinecart.class b/build/classes/java/main/net/minecraft/src/RenderTntMinecart.class index cbeb27f..477c30b 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderTntMinecart.class and b/build/classes/java/main/net/minecraft/src/RenderTntMinecart.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderVillager.class b/build/classes/java/main/net/minecraft/src/RenderVillager.class index d6eab84..8fd2aeb 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderVillager.class and b/build/classes/java/main/net/minecraft/src/RenderVillager.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderWitch.class b/build/classes/java/main/net/minecraft/src/RenderWitch.class index 9014435..ba17aa0 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderWitch.class and b/build/classes/java/main/net/minecraft/src/RenderWitch.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderWither.class b/build/classes/java/main/net/minecraft/src/RenderWither.class index a84d232..044e1f2 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderWither.class and b/build/classes/java/main/net/minecraft/src/RenderWither.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderWitherSkull.class b/build/classes/java/main/net/minecraft/src/RenderWitherSkull.class index 3b76e5a..22850fd 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderWitherSkull.class and b/build/classes/java/main/net/minecraft/src/RenderWitherSkull.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderWolf.class b/build/classes/java/main/net/minecraft/src/RenderWolf.class index be08629..11e9575 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderWolf.class and b/build/classes/java/main/net/minecraft/src/RenderWolf.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderXPOrb.class b/build/classes/java/main/net/minecraft/src/RenderXPOrb.class index 9898ac2..baba008 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderXPOrb.class and b/build/classes/java/main/net/minecraft/src/RenderXPOrb.class differ diff --git a/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class b/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class index 8c095bb..7583b64 100644 Binary files a/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class and b/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class differ diff --git a/build/classes/java/main/net/minecraft/src/ScreenShotHelper.class b/build/classes/java/main/net/minecraft/src/ScreenShotHelper.class index 972db5c..7122595 100644 Binary files a/build/classes/java/main/net/minecraft/src/ScreenShotHelper.class and b/build/classes/java/main/net/minecraft/src/ScreenShotHelper.class differ diff --git a/build/classes/java/main/net/minecraft/src/SelectionListBase.class b/build/classes/java/main/net/minecraft/src/SelectionListBase.class index 3fc0c4f..dd92100 100644 Binary files a/build/classes/java/main/net/minecraft/src/SelectionListBase.class and b/build/classes/java/main/net/minecraft/src/SelectionListBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/TextureUtil.class b/build/classes/java/main/net/minecraft/src/TextureUtil.class index 40f16a8..85cae00 100644 Binary files a/build/classes/java/main/net/minecraft/src/TextureUtil.class and b/build/classes/java/main/net/minecraft/src/TextureUtil.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityBeaconRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntityBeaconRenderer.class index a1c727b..48c131b 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityBeaconRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntityBeaconRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityChestRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntityChestRenderer.class index 06d21fd..b321c98 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityChestRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntityChestRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityEnderChestRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntityEnderChestRenderer.class index e7687d5..a675576 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityEnderChestRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntityEnderChestRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityMobSpawnerRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntityMobSpawnerRenderer.class index ef93dac..f87f6f0 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityMobSpawnerRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntityMobSpawnerRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntityRenderer.class index 990c2a3..f273a82 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntityRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityRendererPiston.class b/build/classes/java/main/net/minecraft/src/TileEntityRendererPiston.class index 79ddd48..e1e41c6 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityRendererPiston.class and b/build/classes/java/main/net/minecraft/src/TileEntityRendererPiston.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntitySignRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntitySignRenderer.class index 0423848..442800b 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntitySignRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntitySignRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntitySkullRenderer.class b/build/classes/java/main/net/minecraft/src/TileEntitySkullRenderer.class index 13d7806..849a111 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntitySkullRenderer.class and b/build/classes/java/main/net/minecraft/src/TileEntitySkullRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldRenderer.class b/build/classes/java/main/net/minecraft/src/WorldRenderer.class index 1270bed..35d449c 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldRenderer.class and b/build/classes/java/main/net/minecraft/src/WorldRenderer.class differ diff --git a/build/libs/eaglercraft.jar b/build/libs/eaglercraft.jar index f786d62..5c8ca86 100644 Binary files a/build/libs/eaglercraft.jar and b/build/libs/eaglercraft.jar differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 5ec6ada..032f6b6 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index f786d62..5c8ca86 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/main/java/net/minecraft/src/ActiveRenderInfo.java b/src/main/java/net/minecraft/src/ActiveRenderInfo.java index 04380aa..81925b7 100644 --- a/src/main/java/net/minecraft/src/ActiveRenderInfo.java +++ b/src/main/java/net/minecraft/src/ActiveRenderInfo.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.util.glu.GLU; public class ActiveRenderInfo @@ -17,7 +17,7 @@ public class ActiveRenderInfo public static float objectZ; /** The current GL viewport */ - private static IntBuffer viewport = GLAllocation.createDirectIntBuffer(16); + private static int[] viewport = new int[4]; /** The current GL modelview matrix */ private static FloatBuffer modelview = GLAllocation.createDirectFloatBuffer(16); @@ -52,12 +52,12 @@ public class ActiveRenderInfo */ public static void updateRenderInfo(EntityPlayer par0EntityPlayer, boolean par1) { - GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, modelview); - GL11.glGetFloat(GL11.GL_PROJECTION_MATRIX, projection); - GL11.glGetInteger(GL11.GL_VIEWPORT, viewport); - float var2 = (float)((viewport.get(0) + viewport.get(2)) / 2); - float var3 = (float)((viewport.get(1) + viewport.get(3)) / 2); - GLU.gluUnProject(var2, var3, 0.0F, modelview, projection, viewport, objectCoords); + EaglerAdapter.glGetFloat(EaglerAdapter.GL_MODELVIEW_MATRIX, modelview); + EaglerAdapter.glGetFloat(EaglerAdapter.GL_PROJECTION_MATRIX, projection); + EaglerAdapter.glGetInteger(EaglerAdapter.GL_VIEWPORT, viewport); + float var2 = (float) ((viewport[0] + viewport[2]) / 2); + float var3 = (float) ((viewport[1] + viewport[3]) / 2); + EaglerAdapter.gluUnProject(var2, var3, 0.0F, modelview, projection, viewport, objectCoords); objectX = objectCoords.get(0); objectY = objectCoords.get(1); objectZ = objectCoords.get(2); diff --git a/src/main/java/net/minecraft/src/CallableGLInfo.java b/src/main/java/net/minecraft/src/CallableGLInfo.java index 65f452a..96480fa 100644 --- a/src/main/java/net/minecraft/src/CallableGLInfo.java +++ b/src/main/java/net/minecraft/src/CallableGLInfo.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.concurrent.Callable; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; class CallableGLInfo implements Callable { @@ -15,7 +15,7 @@ class CallableGLInfo implements Callable public String getTexturePack() { - return GL11.glGetString(GL11.GL_RENDERER) + " GL version " + GL11.glGetString(GL11.GL_VERSION) + ", " + GL11.glGetString(GL11.GL_VENDOR); + return "GL_SHADING_LANGUAGE_VERSION = 35724 and GL_VERSION = 7938"; } public Object call() diff --git a/src/main/java/net/minecraft/src/ClippingHelperImpl.java b/src/main/java/net/minecraft/src/ClippingHelperImpl.java index afa0229..212591b 100644 --- a/src/main/java/net/minecraft/src/ClippingHelperImpl.java +++ b/src/main/java/net/minecraft/src/ClippingHelperImpl.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.nio.FloatBuffer; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ClippingHelperImpl extends ClippingHelper { @@ -36,8 +36,8 @@ public class ClippingHelperImpl extends ClippingHelper this.projectionMatrixBuffer.clear(); this.modelviewMatrixBuffer.clear(); this.field_78564_h.clear(); - GL11.glGetFloat(GL11.GL_PROJECTION_MATRIX, this.projectionMatrixBuffer); - GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, this.modelviewMatrixBuffer); + EaglerAdapter.glGetFloat(EaglerAdapter.GL_PROJECTION_MATRIX, this.projectionMatrixBuffer); + EaglerAdapter.glGetFloat(EaglerAdapter.GL_MODELVIEW_MATRIX, this.modelviewMatrixBuffer); this.projectionMatrixBuffer.flip().limit(16); this.projectionMatrixBuffer.get(this.projectionMatrix); this.modelviewMatrixBuffer.flip().limit(16); diff --git a/src/main/java/net/minecraft/src/EffectRenderer.java b/src/main/java/net/minecraft/src/EffectRenderer.java index 8fce1e3..0684067 100644 --- a/src/main/java/net/minecraft/src/EffectRenderer.java +++ b/src/main/java/net/minecraft/src/EffectRenderer.java @@ -6,7 +6,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class EffectRenderer { @@ -97,11 +97,11 @@ public class EffectRenderer TextureMap.locationItemsTexture.bindTexture(); } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.003921569F); Tessellator var9 = Tessellator.instance; var9.startDrawingQuads(); @@ -113,9 +113,9 @@ public class EffectRenderer } var9.draw(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.1F); } } } diff --git a/src/main/java/net/minecraft/src/EntityFootStepFX.java b/src/main/java/net/minecraft/src/EntityFootStepFX.java index 90341ec..054de0f 100644 --- a/src/main/java/net/minecraft/src/EntityFootStepFX.java +++ b/src/main/java/net/minecraft/src/EntityFootStepFX.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class EntityFootStepFX extends EntityFX { @@ -31,15 +31,15 @@ public class EntityFootStepFX extends EntityFX } var9 *= 0.2F; - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); float var10 = 0.125F; float var11 = (float)(this.posX - interpPosX); float var12 = (float)(this.posY - interpPosY); float var13 = (float)(this.posZ - interpPosZ); float var14 = this.worldObj.getLightBrightness(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY), MathHelper.floor_double(this.posZ)); field_110126_a.bindTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); par1Tessellator.startDrawingQuads(); par1Tessellator.setColorRGBA_F(var14, var14, var14, var9); par1Tessellator.addVertexWithUV((double)(var11 - var10), (double)var12, (double)(var13 + var10), 0.0D, 1.0D); @@ -47,8 +47,8 @@ public class EntityFootStepFX extends EntityFX par1Tessellator.addVertexWithUV((double)(var11 + var10), (double)var12, (double)(var13 - var10), 1.0D, 0.0D); par1Tessellator.addVertexWithUV((double)(var11 - var10), (double)var12, (double)(var13 - var10), 0.0D, 0.0D); par1Tessellator.draw(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } /** diff --git a/src/main/java/net/minecraft/src/EntityLargeExplodeFX.java b/src/main/java/net/minecraft/src/EntityLargeExplodeFX.java index 77d6a69..5732037 100644 --- a/src/main/java/net/minecraft/src/EntityLargeExplodeFX.java +++ b/src/main/java/net/minecraft/src/EntityLargeExplodeFX.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class EntityLargeExplodeFX extends EntityFX { @@ -38,8 +38,8 @@ public class EntityLargeExplodeFX extends EntityFX float var14 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX); float var15 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY); float var16 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); RenderHelper.disableStandardItemLighting(); par1Tessellator.startDrawingQuads(); par1Tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1.0F); @@ -50,8 +50,8 @@ public class EntityLargeExplodeFX extends EntityFX par1Tessellator.addVertexWithUV((double)(var14 + par3 * var13 + par6 * var13), (double)(var15 + par4 * var13), (double)(var16 + par5 * var13 + par7 * var13), (double)var9, (double)var11); par1Tessellator.addVertexWithUV((double)(var14 + par3 * var13 - par6 * var13), (double)(var15 - par4 * var13), (double)(var16 + par5 * var13 - par7 * var13), (double)var9, (double)var12); par1Tessellator.draw(); - GL11.glPolygonOffset(0.0F, 0.0F); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glPolygonOffset(0.0F, 0.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } } diff --git a/src/main/java/net/minecraft/src/EntityPickupFX.java b/src/main/java/net/minecraft/src/EntityPickupFX.java index b4d3bde..0e71549 100644 --- a/src/main/java/net/minecraft/src/EntityPickupFX.java +++ b/src/main/java/net/minecraft/src/EntityPickupFX.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class EntityPickupFX extends EntityFX { @@ -42,7 +42,7 @@ public class EntityPickupFX extends EntityFX int var31 = var30 % 65536; int var32 = var30 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var31 / 1.0F, (float)var32 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); var21 -= interpPosX; var23 -= interpPosY; var25 -= interpPosZ; diff --git a/src/main/java/net/minecraft/src/GuiAchievement.java b/src/main/java/net/minecraft/src/GuiAchievement.java index 3e80ec1..5f25e92 100644 --- a/src/main/java/net/minecraft/src/GuiAchievement.java +++ b/src/main/java/net/minecraft/src/GuiAchievement.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiAchievement extends Gui @@ -64,23 +64,23 @@ public class GuiAchievement extends Gui */ private void updateAchievementWindowScale() { - GL11.glViewport(0, 0, this.theGame.displayWidth, this.theGame.displayHeight); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); + EaglerAdapter.glViewport(0, 0, this.theGame.displayWidth, this.theGame.displayHeight); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); this.achievementWindowWidth = this.theGame.displayWidth; this.achievementWindowHeight = this.theGame.displayHeight; ScaledResolution var1 = new ScaledResolution(this.theGame.gameSettings, this.theGame.displayWidth, this.theGame.displayHeight); this.achievementWindowWidth = var1.getScaledWidth(); this.achievementWindowHeight = var1.getScaledHeight(); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, (double)this.achievementWindowWidth, (double)this.achievementWindowHeight, 0.0D, 1000.0D, 3000.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, 0.0F, -2000.0F); + EaglerAdapter.glClear(EaglerAdapter.GL_DEPTH_BUFFER_BIT); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glOrtho(0.0F, this.achievementWindowWidth, this.achievementWindowHeight, 0.0F, 1000.0F, 3000.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -2000.0F); } /** @@ -99,8 +99,8 @@ public class GuiAchievement extends Gui else { this.updateAchievementWindowScale(); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(false); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthMask(false); double var3 = var1 * 2.0D; if (var3 > 1.0D) @@ -120,10 +120,10 @@ public class GuiAchievement extends Gui var3 *= var3; int var5 = this.achievementWindowWidth - 160; int var6 = 0 - (int)(var3 * 36.0D); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); achievementTextures.bindTexture(); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); this.drawTexturedModalRect(var5, var6, 96, 202, 160, 32); if (this.haveAchiement) @@ -137,14 +137,14 @@ public class GuiAchievement extends Gui } RenderHelper.enableGUIStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); this.itemRender.renderItemAndEffectIntoGUI(this.theGame.fontRenderer, this.theGame.getTextureManager(), this.theAchievement.theItemStack, var5 + 8, var6 + 8); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); } } } diff --git a/src/main/java/net/minecraft/src/GuiAchievements.java b/src/main/java/net/minecraft/src/GuiAchievements.java index a599533..48bd60a 100644 --- a/src/main/java/net/minecraft/src/GuiAchievements.java +++ b/src/main/java/net/minecraft/src/GuiAchievements.java @@ -3,8 +3,9 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; +import net.lax1dude.eaglercraft.glemu.RealOpenGLEnums; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiAchievements extends GuiScreen @@ -149,11 +150,11 @@ public class GuiAchievements extends GuiScreen this.drawDefaultBackground(); this.genAchievementBackground(par1, par2, par3); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); this.drawTitle(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); } /** @@ -218,13 +219,13 @@ public class GuiAchievements extends GuiScreen int var8 = var6 + 16; int var9 = var7 + 17; this.zLevel = 0.0F; - GL11.glDepthFunc(GL11.GL_GEQUAL); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, -200.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); + EaglerAdapter.glDepthFunc(RealOpenGLEnums.GL_GEQUAL); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -200.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); int var10 = var4 + 288 >> 4; int var11 = var5 + 288 >> 4; int var12 = (var4 + 288) % 16; @@ -242,7 +243,7 @@ public class GuiAchievements extends GuiScreen for (var20 = 0; var20 * 16 - var13 < 155; ++var20) { float var21 = 0.6F - (float)(var11 + var20) / 25.0F * 0.3F; - GL11.glColor4f(var21, var21, var21, 1.0F); + EaglerAdapter.glColor4f(var21, var21, var21, 1.0F); for (var22 = 0; var22 * 16 - var12 < 224; ++var22) { @@ -291,9 +292,9 @@ public class GuiAchievements extends GuiScreen } } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glDepthFunc(GL11.GL_LEQUAL); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); int var25; int var28; int var37; @@ -330,9 +331,9 @@ public class GuiAchievements extends GuiScreen Achievement var30 = null; RenderItem var32 = new RenderItem(); RenderHelper.enableGUIStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); int var38; int var39; @@ -349,17 +350,17 @@ public class GuiAchievements extends GuiScreen if (this.statFileWriter.hasAchievementUnlocked(var33)) { var36 = 1.0F; - GL11.glColor4f(var36, var36, var36, 1.0F); + EaglerAdapter.glColor4f(var36, var36, var36, 1.0F); } else if (this.statFileWriter.canUnlockAchievement(var33)) { var36 = Math.sin((double)(Minecraft.getSystemTime() % 600L) / 600.0D * Math.PI * 2.0D) < 0.6D ? 0.6F : 0.8F; - GL11.glColor4f(var36, var36, var36, 1.0F); + EaglerAdapter.glColor4f(var36, var36, var36, 1.0F); } else { var36 = 0.3F; - GL11.glColor4f(var36, var36, var36, 1.0F); + EaglerAdapter.glColor4f(var36, var36, var36, 1.0F); } achievementTextures.bindTexture(); @@ -378,21 +379,21 @@ public class GuiAchievements extends GuiScreen if (!this.statFileWriter.canUnlockAchievement(var33)) { float var40 = 0.1F; - GL11.glColor4f(var40, var40, var40, 1.0F); + EaglerAdapter.glColor4f(var40, var40, var40, 1.0F); var32.renderWithColor = false; } - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); var32.renderItemAndEffectIntoGUI(this.mc.fontRenderer, this.mc.getTextureManager(), var33.theItemStack, var38 + 3, var39 + 3); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); if (!this.statFileWriter.canUnlockAchievement(var33)) { var32.renderWithColor = true; } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); if (par1 >= var8 && par2 >= var9 && par1 < var8 + 224 && par2 < var9 + 155 && par1 >= var38 && par1 <= var38 + 22 && par2 >= var39 && par2 <= var39 + 22) { @@ -401,16 +402,16 @@ public class GuiAchievements extends GuiScreen } } - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); achievementTextures.bindTexture(); this.drawTexturedModalRect(var6, var7, 0, 0, this.achievementsPaneWidth, this.achievementsPaneHeight); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); this.zLevel = 0.0F; - GL11.glDepthFunc(GL11.GL_LEQUAL); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); super.drawScreen(par1, par2, par3); if (var30 != null) @@ -450,8 +451,8 @@ public class GuiAchievements extends GuiScreen this.fontRenderer.drawStringWithShadow(var34, var37, var25, this.statFileWriter.canUnlockAchievement(var30) ? (var30.getSpecial() ? -128 : -1) : (var30.getSpecial() ? -8355776 : -8355712)); } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/net/minecraft/src/GuiBeacon.java b/src/main/java/net/minecraft/src/GuiBeacon.java index 83a3b85..36679b9 100644 --- a/src/main/java/net/minecraft/src/GuiBeacon.java +++ b/src/main/java/net/minecraft/src/GuiBeacon.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import java.util.Iterator; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiBeacon extends GuiContainer { @@ -194,7 +194,7 @@ public class GuiBeacon extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); beaconGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiBeaconButton.java b/src/main/java/net/minecraft/src/GuiBeaconButton.java index 9f5c22f..da4fffd 100644 --- a/src/main/java/net/minecraft/src/GuiBeaconButton.java +++ b/src/main/java/net/minecraft/src/GuiBeaconButton.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; class GuiBeaconButton extends GuiButton { @@ -27,7 +27,7 @@ class GuiBeaconButton extends GuiButton if (this.drawButton) { GuiBeacon.getBeaconGuiTextures().bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_82253_i = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; short var4 = 219; int var5 = 0; diff --git a/src/main/java/net/minecraft/src/GuiBrewingStand.java b/src/main/java/net/minecraft/src/GuiBrewingStand.java index 79b17f7..2b3937e 100644 --- a/src/main/java/net/minecraft/src/GuiBrewingStand.java +++ b/src/main/java/net/minecraft/src/GuiBrewingStand.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.TextureLocation; public class GuiBrewingStand extends GuiContainer @@ -29,7 +29,7 @@ public class GuiBrewingStand extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); brewingStandGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiButtonLanguage.java b/src/main/java/net/minecraft/src/GuiButtonLanguage.java index 90ae5e1..1e196a9 100644 --- a/src/main/java/net/minecraft/src/GuiButtonLanguage.java +++ b/src/main/java/net/minecraft/src/GuiButtonLanguage.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiButtonLanguage extends GuiButton { @@ -17,7 +17,7 @@ public class GuiButtonLanguage extends GuiButton if (this.drawButton) { GuiButton.buttonTextures.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; int var5 = 106; diff --git a/src/main/java/net/minecraft/src/GuiButtonMerchant.java b/src/main/java/net/minecraft/src/GuiButtonMerchant.java index 5862ae7..6a10ff5 100644 --- a/src/main/java/net/minecraft/src/GuiButtonMerchant.java +++ b/src/main/java/net/minecraft/src/GuiButtonMerchant.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; class GuiButtonMerchant extends GuiButton { @@ -23,7 +23,7 @@ class GuiButtonMerchant extends GuiButton if (this.drawButton) { GuiMerchant.func_110417_h().bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; int var5 = 0; int var6 = 176; diff --git a/src/main/java/net/minecraft/src/GuiButtonNextPage.java b/src/main/java/net/minecraft/src/GuiButtonNextPage.java index 555185b..ed65937 100644 --- a/src/main/java/net/minecraft/src/GuiButtonNextPage.java +++ b/src/main/java/net/minecraft/src/GuiButtonNextPage.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; class GuiButtonNextPage extends GuiButton { @@ -23,7 +23,7 @@ class GuiButtonNextPage extends GuiButton if (this.drawButton) { boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GuiScreenBook.func_110404_g().bindTexture(); int var5 = 0; int var6 = 192; diff --git a/src/main/java/net/minecraft/src/GuiChest.java b/src/main/java/net/minecraft/src/GuiChest.java index 1ac7a6e..fe433ba 100644 --- a/src/main/java/net/minecraft/src/GuiChest.java +++ b/src/main/java/net/minecraft/src/GuiChest.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiChest extends GuiContainer { @@ -40,7 +40,7 @@ public class GuiChest extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); field_110421_t.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiContainer.java b/src/main/java/net/minecraft/src/GuiContainer.java index ec726f7..d093b2a 100644 --- a/src/main/java/net/minecraft/src/GuiContainer.java +++ b/src/main/java/net/minecraft/src/GuiContainer.java @@ -8,7 +8,7 @@ import java.util.Set; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public abstract class GuiContainer extends GuiScreen @@ -93,21 +93,21 @@ public abstract class GuiContainer extends GuiScreen int var4 = this.guiLeft; int var5 = this.guiTop; this.drawGuiContainerBackgroundLayer(par3, par1, par2); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); super.drawScreen(par1, par2, par3); RenderHelper.enableGUIStandardItemLighting(); - GL11.glPushMatrix(); - GL11.glTranslatef((float)var4, (float)var5, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)var4, (float)var5, 0.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); this.theSlot = null; short var6 = 240; short var7 = 240; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var6 / 1.0F, (float)var7 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int var9; for (int var13 = 0; var13 < this.inventorySlots.inventorySlots.size(); ++var13) @@ -118,13 +118,13 @@ public abstract class GuiContainer extends GuiScreen if (this.isMouseOverSlot(var15, par1, par2) && var15.func_111238_b()) { this.theSlot = var15; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); int var8 = var15.xDisplayPosition; var9 = var15.yDisplayPosition; this.drawGradientRect(var8, var9, var8 + 16, var9 + 16, -2130706433, -2130706433); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); } } @@ -174,7 +174,7 @@ public abstract class GuiContainer extends GuiScreen this.drawItemStack(this.returningStack, var11, var12, (String)null); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); if (var14.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack()) { @@ -182,14 +182,14 @@ public abstract class GuiContainer extends GuiScreen this.drawItemStackTooltip(var19, par1, par2); } - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); RenderHelper.enableStandardItemLighting(); } private void drawItemStack(ItemStack par1ItemStack, int par2, int par3, String par4Str) { - GL11.glTranslatef(0.0F, 0.0F, 32.0F); + EaglerAdapter.glTranslatef(0.0F, 0.0F, 32.0F); this.zLevel = 200.0F; itemRenderer.zLevel = 200.0F; itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), par1ItemStack, par2, par3); @@ -230,10 +230,10 @@ public abstract class GuiContainer extends GuiScreen { if (!par1List.isEmpty()) { - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); int var4 = 0; Iterator var5 = par1List.iterator(); @@ -297,10 +297,10 @@ public abstract class GuiContainer extends GuiScreen this.zLevel = 0.0F; itemRenderer.zLevel = 0.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); RenderHelper.enableStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); } } @@ -373,10 +373,10 @@ public abstract class GuiContainer extends GuiScreen if (var9 != null) { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); TextureMap.locationItemsTexture.bindTexture(); this.drawTexturedModelRectFromIcon(var2, var3, var9, 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); var6 = true; } } @@ -388,7 +388,7 @@ public abstract class GuiContainer extends GuiScreen drawRect(var2, var3, var2 + 16, var3 + 16, -2130706433); } - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var4, var2, var3); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var4, var2, var3, var8); } diff --git a/src/main/java/net/minecraft/src/GuiContainerCreative.java b/src/main/java/net/minecraft/src/GuiContainerCreative.java index 18c8849..a1d53ac 100644 --- a/src/main/java/net/minecraft/src/GuiContainerCreative.java +++ b/src/main/java/net/minecraft/src/GuiContainerCreative.java @@ -8,7 +8,7 @@ import java.util.Map; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiContainerCreative extends InventoryEffectRenderer @@ -648,8 +648,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer this.drawCreativeTabHoveringText(I18n.getString("inventory.binSlot"), par1, par2); } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); } protected void drawItemStackTooltip(ItemStack par1ItemStack, int par2, int par3) @@ -712,7 +712,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderHelper.enableGUIStandardItemLighting(); CreativeTabs var4 = CreativeTabs.creativeTabArray[selectedTabIndex]; CreativeTabs[] var5 = CreativeTabs.creativeTabArray; @@ -733,7 +733,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer new TextureLocation("textures/gui/container/creative_inventory/tab_" + var4.getBackgroundImageName()).bindTexture(); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); this.searchField.drawTextBox(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int var9 = this.guiLeft + 175; var6 = this.guiTop + 18; var7 = var6 + 112; @@ -860,18 +860,18 @@ public class GuiContainerCreative extends InventoryEffectRenderer var8 += this.ySize - 4; } - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); this.drawTexturedModalRect(var7, var8, var5, var6, 28, var9); this.zLevel = 100.0F; itemRenderer.zLevel = 100.0F; var7 += 6; var8 += 8 + (var3 ? 1 : -1); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); ItemStack var10 = new ItemStack(par1CreativeTabs.getTabIconItem()); itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); itemRenderer.zLevel = 0.0F; this.zLevel = 0.0F; } diff --git a/src/main/java/net/minecraft/src/GuiCrafting.java b/src/main/java/net/minecraft/src/GuiCrafting.java index 4165de9..f460709 100644 --- a/src/main/java/net/minecraft/src/GuiCrafting.java +++ b/src/main/java/net/minecraft/src/GuiCrafting.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiCrafting extends GuiContainer { @@ -26,7 +26,7 @@ public class GuiCrafting extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); craftingTableGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiCreateFlatWorldListSlot.java b/src/main/java/net/minecraft/src/GuiCreateFlatWorldListSlot.java index 2574dfb..56df2d5 100644 --- a/src/main/java/net/minecraft/src/GuiCreateFlatWorldListSlot.java +++ b/src/main/java/net/minecraft/src/GuiCreateFlatWorldListSlot.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -20,7 +20,7 @@ class GuiCreateFlatWorldListSlot extends GuiSlot private void func_82452_a(int par1, int par2, ItemStack par3ItemStack) { this.func_82451_d(par1 + 1, par2 + 1); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); if (par3ItemStack != null) { @@ -29,7 +29,7 @@ class GuiCreateFlatWorldListSlot extends GuiSlot RenderHelper.disableStandardItemLighting(); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } private void func_82451_d(int par1, int par2) @@ -39,7 +39,7 @@ class GuiCreateFlatWorldListSlot extends GuiSlot private void func_82450_b(int par1, int par2, int par3, int par4) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Gui.statIcons.bindTexture(); float var5 = 0.0078125F; float var6 = 0.0078125F; diff --git a/src/main/java/net/minecraft/src/GuiDispenser.java b/src/main/java/net/minecraft/src/GuiDispenser.java index e76788e..78a9737 100644 --- a/src/main/java/net/minecraft/src/GuiDispenser.java +++ b/src/main/java/net/minecraft/src/GuiDispenser.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiDispenser extends GuiContainer { @@ -29,7 +29,7 @@ public class GuiDispenser extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); dispenserGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiEditSign.java b/src/main/java/net/minecraft/src/GuiEditSign.java index e01d7a0..2868df5 100644 --- a/src/main/java/net/minecraft/src/GuiEditSign.java +++ b/src/main/java/net/minecraft/src/GuiEditSign.java @@ -1,7 +1,7 @@ package net.minecraft.src; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiEditSign extends GuiScreen { @@ -118,18 +118,18 @@ public class GuiEditSign extends GuiScreen { this.drawDefaultBackground(); this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 40, 16777215); - GL11.glPushMatrix(); - GL11.glTranslatef((float)(this.width / 2), 0.0F, 50.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)(this.width / 2), 0.0F, 50.0F); float var4 = 93.75F; - GL11.glScalef(-var4, -var4, -var4); - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(-var4, -var4, -var4); + EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); Block var5 = this.entitySign.getBlockType(); if (var5 == Block.signPost) { float var6 = (float)(this.entitySign.getBlockMetadata() * 360) / 16.0F; - GL11.glRotatef(var6, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0625F, 0.0F); + EaglerAdapter.glRotatef(var6, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -1.0625F, 0.0F); } else { @@ -151,8 +151,8 @@ public class GuiEditSign extends GuiScreen var7 = -90.0F; } - GL11.glRotatef(var7, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0625F, 0.0F); + EaglerAdapter.glRotatef(var7, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -1.0625F, 0.0F); } if (this.updateCounter / 6 % 2 == 0) @@ -162,7 +162,7 @@ public class GuiEditSign extends GuiScreen TileEntityRenderer.instance.renderTileEntityAt(this.entitySign, -0.5D, -0.75D, -0.5D, 0.0F); this.entitySign.lineBeingEdited = -1; - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); super.drawScreen(par1, par2, par3); } } diff --git a/src/main/java/net/minecraft/src/GuiEnchantment.java b/src/main/java/net/minecraft/src/GuiEnchantment.java index 43b6161..be65ca0 100644 --- a/src/main/java/net/minecraft/src/GuiEnchantment.java +++ b/src/main/java/net/minecraft/src/GuiEnchantment.java @@ -3,7 +3,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; import org.lwjgl.util.glu.Project; @@ -79,34 +79,34 @@ public class GuiEnchantment extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); enchantingTableGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; this.drawTexturedModalRect(var4, var5, 0, 0, this.xSize, this.ySize); - GL11.glPushMatrix(); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glPushMatrix(); - GL11.glLoadIdentity(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glLoadIdentity(); ScaledResolution var6 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); - GL11.glViewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor()); - GL11.glTranslatef(-0.34F, 0.23F, 0.0F); + EaglerAdapter.glViewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor()); + EaglerAdapter.glTranslatef(-0.34F, 0.23F, 0.0F); Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F); float var7 = 1.0F; - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); RenderHelper.enableStandardItemLighting(); - GL11.glTranslatef(0.0F, 3.3F, -16.0F); - GL11.glScalef(var7, var7, var7); + EaglerAdapter.glTranslatef(0.0F, 3.3F, -16.0F); + EaglerAdapter.glScalef(var7, var7, var7); float var8 = 5.0F; - GL11.glScalef(var8, var8, var8); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glScalef(var8, var8, var8); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); enchantingTableBookTextures.bindTexture(); - GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); float var9 = this.field_74208_u + (this.field_74209_t - this.field_74208_u) * par1; - GL11.glTranslatef((1.0F - var9) * 0.2F, (1.0F - var9) * 0.1F, (1.0F - var9) * 0.25F); - GL11.glRotatef(-(1.0F - var9) * 90.0F - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef((1.0F - var9) * 0.2F, (1.0F - var9) * 0.1F, (1.0F - var9) * 0.25F); + EaglerAdapter.glRotatef(-(1.0F - var9) * 90.0F - 90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); float var10 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.25F; float var11 = this.field_74212_q + (this.field_74213_p - this.field_74212_q) * par1 + 0.75F; var10 = (var10 - (float)MathHelper.truncateDoubleToInt((double)var10)) * 1.6F - 0.3F; @@ -132,17 +132,17 @@ public class GuiEnchantment extends GuiContainer var11 = 1.0F; } - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); bookModel.render((Entity)null, 0.0F, var10, var11, var9, 0.0F, 0.0625F); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glPopMatrix(); RenderHelper.disableStandardItemLighting(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EnchantmentNameParts.instance.setRandSeed(this.containerEnchantment.nameSeed); for (int var12 = 0; var12 < 3; ++var12) @@ -151,7 +151,7 @@ public class GuiEnchantment extends GuiContainer this.zLevel = 0.0F; enchantingTableGuiTextures.bindTexture(); int var14 = this.containerEnchantment.enchantLevels[var12]; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); if (var14 == 0) { diff --git a/src/main/java/net/minecraft/src/GuiFlatPresetsListSlot.java b/src/main/java/net/minecraft/src/GuiFlatPresetsListSlot.java index 0f8b483..c276f42 100644 --- a/src/main/java/net/minecraft/src/GuiFlatPresetsListSlot.java +++ b/src/main/java/net/minecraft/src/GuiFlatPresetsListSlot.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -20,11 +20,11 @@ class GuiFlatPresetsListSlot extends GuiSlot private void func_82457_a(int par1, int par2, int par3) { this.func_82456_d(par1 + 1, par2 + 1); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); GuiFlatPresets.getPresetIconRenderer().renderItemIntoGUI(this.flatPresetsGui.fontRenderer, this.flatPresetsGui.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } private void func_82456_d(int par1, int par2) @@ -34,7 +34,7 @@ class GuiFlatPresetsListSlot extends GuiSlot private void func_82455_b(int par1, int par2, int par3, int par4) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Gui.statIcons.bindTexture(); float var5 = 0.0078125F; float var6 = 0.0078125F; diff --git a/src/main/java/net/minecraft/src/GuiFurnace.java b/src/main/java/net/minecraft/src/GuiFurnace.java index 457a4a5..ee43b11 100644 --- a/src/main/java/net/minecraft/src/GuiFurnace.java +++ b/src/main/java/net/minecraft/src/GuiFurnace.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiFurnace extends GuiContainer { @@ -29,7 +29,7 @@ public class GuiFurnace extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); furnaceGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiGameOver.java b/src/main/java/net/minecraft/src/GuiGameOver.java index befda65..dd3cb03 100644 --- a/src/main/java/net/minecraft/src/GuiGameOver.java +++ b/src/main/java/net/minecraft/src/GuiGameOver.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.Iterator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiGameOver extends GuiScreen { @@ -77,12 +77,12 @@ public class GuiGameOver extends GuiScreen public void drawScreen(int par1, int par2, float par3) { this.drawGradientRect(0, 0, this.width, this.height, 1615855616, -1602211792); - GL11.glPushMatrix(); - GL11.glScalef(2.0F, 2.0F, 2.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(2.0F, 2.0F, 2.0F); boolean var4 = this.mc.theWorld.getWorldInfo().isHardcoreModeEnabled(); String var5 = var4 ? I18n.getString("deathScreen.title.hardcore") : I18n.getString("deathScreen.title"); this.drawCenteredString(this.fontRenderer, var5, this.width / 2 / 2, 30, 16777215); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); if (var4) { diff --git a/src/main/java/net/minecraft/src/GuiHopper.java b/src/main/java/net/minecraft/src/GuiHopper.java index 5f82fcf..423c635 100644 --- a/src/main/java/net/minecraft/src/GuiHopper.java +++ b/src/main/java/net/minecraft/src/GuiHopper.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiHopper extends GuiContainer { @@ -32,7 +32,7 @@ public class GuiHopper extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); hopperGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiIngame.java b/src/main/java/net/minecraft/src/GuiIngame.java index 70f3ea3..a015ff0 100644 --- a/src/main/java/net/minecraft/src/GuiIngame.java +++ b/src/main/java/net/minecraft/src/GuiIngame.java @@ -8,7 +8,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiIngame extends Gui @@ -56,7 +56,7 @@ public class GuiIngame extends Gui int var7 = var5.getScaledHeight(); FontRenderer var8 = this.mc.fontRenderer; this.mc.entityRenderer.setupOverlayRendering(); - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); if (Minecraft.isFancyGraphicsEnabled()) { @@ -64,7 +64,7 @@ public class GuiIngame extends Gui } else { - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); } ItemStack var9 = this.mc.thePlayer.inventory.armorItemInSlot(3); @@ -90,17 +90,17 @@ public class GuiIngame extends Gui if (!this.mc.playerController.enableEverythingIsScrewedUpMode()) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); widgetsTexPath.bindTexture(); InventoryPlayer var31 = this.mc.thePlayer.inventory; this.zLevel = -90.0F; this.drawTexturedModalRect(var6 / 2 - 91, var7 - 22, 0, 0, 182, 22); this.drawTexturedModalRect(var6 / 2 - 91 - 1 + var31.currentItem * 20, var7 - 22 - 1, 0, 22, 24, 22); icons.bindTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_ONE_MINUS_DST_COLOR, GL11.GL_ONE_MINUS_SRC_COLOR); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE_MINUS_DST_COLOR, EaglerAdapter.GL_ONE_MINUS_SRC_COLOR); this.drawTexturedModalRect(var6 / 2 - 7, var7 / 2 - 7, 0, 0, 16, 16); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); this.mc.mcProfiler.startSection("bossHealth"); this.renderBossHealth(); this.mc.mcProfiler.endSection(); @@ -110,9 +110,9 @@ public class GuiIngame extends Gui this.func_110327_a(var6, var7); } - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); this.mc.mcProfiler.startSection("actionBar"); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); for (var11 = 0; var11 < 9; ++var11) @@ -123,7 +123,7 @@ public class GuiIngame extends Gui } RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); this.mc.mcProfiler.endSection(); } @@ -132,8 +132,8 @@ public class GuiIngame extends Gui if (this.mc.thePlayer.getSleepTimer() > 0) { this.mc.mcProfiler.startSection("sleep"); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); var32 = this.mc.thePlayer.getSleepTimer(); float var33 = (float)var32 / 100.0F; @@ -144,13 +144,13 @@ public class GuiIngame extends Gui var12 = (int)(220.0F * var33) << 24 | 1052704; drawRect(0, 0, var6, var7, var12); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); this.mc.mcProfiler.endSection(); } var32 = 16777215; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); var11 = var6 / 2 - 91; int var14; int var15; @@ -241,12 +241,12 @@ public class GuiIngame extends Gui if (var15 > 0) { - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); var8.drawStringWithShadow(var36, var13, var14, 16777215 + (var15 << 24)); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glPopMatrix(); } } @@ -279,7 +279,7 @@ public class GuiIngame extends Gui if (this.mc.gameSettings.showDebugInfo) { this.mc.mcProfiler.startSection("debug"); - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); var8.drawStringWithShadow("Minecraft 1.6.4 (" + this.mc.debug + ")", 2, 2, 16777215); var8.drawStringWithShadow(this.mc.debugInfoRenders(), 2, 12, 16777215); var8.drawStringWithShadow(this.mc.getEntityDebug(), 2, 22, 16777215); @@ -310,7 +310,7 @@ public class GuiIngame extends Gui } this.drawString(var8, String.format("ws: %.3f, fs: %.3f, g: %b, fl: %d", new Object[] {Float.valueOf(this.mc.thePlayer.capabilities.getWalkSpeed()), Float.valueOf(this.mc.thePlayer.capabilities.getFlySpeed()), Boolean.valueOf(this.mc.thePlayer.onGround), Integer.valueOf(this.mc.theWorld.getHeightValue(var22, var24))}), 2, 104, 14737632); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); this.mc.mcProfiler.endSection(); } @@ -327,10 +327,10 @@ public class GuiIngame extends Gui if (var13 > 8) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)(var6 / 2), (float)(var7 - 68), 0.0F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)(var6 / 2), (float)(var7 - 68), 0.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); var14 = 16777215; if (this.recordIsPlaying) @@ -339,8 +339,8 @@ public class GuiIngame extends Gui } var8.drawString(this.recordPlaying, -var8.getStringWidth(this.recordPlaying) / 2, -4, var14 + (var13 << 24 & -16777216)); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glPopMatrix(); } this.mc.mcProfiler.endSection(); @@ -353,15 +353,15 @@ public class GuiIngame extends Gui this.func_96136_a(var40, var7, var6, var8); } - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, (float)(var7 - 48), 0.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, (float)(var7 - 48), 0.0F); this.mc.mcProfiler.startSection("chat"); this.persistantChatGUI.drawChat(this.updateCounter); this.mc.mcProfiler.endSection(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); var40 = this.mc.theWorld.getScoreboard().func_96539_a(0); if (this.mc.gameSettings.keyBindPlayerList.pressed && (!this.mc.isIntegratedServerRunning() || this.mc.thePlayer.sendQueue.playerInfoList.size() > 1 || var40 != null)) @@ -393,8 +393,8 @@ public class GuiIngame extends Gui var22 = var19 + var21 % var17 * var46; var23 = var47 + var21 / var17 * 9; drawRect(var22, var23, var22 + var46 - 1, var23 + 8, 553648127); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); if (var21 < var44.size()) { @@ -416,7 +416,7 @@ public class GuiIngame extends Gui } } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); icons.bindTexture(); byte var51 = 0; boolean var52 = false; @@ -454,9 +454,9 @@ public class GuiIngame extends Gui } } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); } private void func_96136_a(ScoreObjective par1ScoreObjective, int par2, int par3, FontRenderer par4FontRenderer) @@ -809,18 +809,18 @@ public class GuiIngame extends Gui String var8 = BossStatus.bossName; var1.drawStringWithShadow(var8, var3 / 2 - var1.getStringWidth(var8) / 2, var7 - 10, 16777215); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); icons.bindTexture(); } } private void renderPumpkinBlur(int par1, int par2) { - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(false); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); pumpkinBlurTexPath.bindTexture(); Tessellator var3 = Tessellator.instance; var3.startDrawingQuads(); @@ -829,10 +829,10 @@ public class GuiIngame extends Gui var3.addVertexWithUV((double)par1, 0.0D, -90.0D, 1.0D, 0.0D); var3.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D); var3.draw(); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } /** @@ -853,10 +853,10 @@ public class GuiIngame extends Gui } this.prevVignetteBrightness = (float)((double)this.prevVignetteBrightness + (double)(par1 - this.prevVignetteBrightness) * 0.01D); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(false); - GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_COLOR); - GL11.glColor4f(this.prevVignetteBrightness, this.prevVignetteBrightness, this.prevVignetteBrightness, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ZERO, EaglerAdapter.GL_ONE_MINUS_SRC_COLOR); + EaglerAdapter.glColor4f(this.prevVignetteBrightness, this.prevVignetteBrightness, this.prevVignetteBrightness, 1.0F); vignetteTexPath.bindTexture(); Tessellator var4 = Tessellator.instance; var4.startDrawingQuads(); @@ -865,10 +865,10 @@ public class GuiIngame extends Gui var4.addVertexWithUV((double)par2, 0.0D, -90.0D, 1.0D, 0.0D); var4.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D); var4.draw(); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); } private void func_130015_b(float par1, int par2, int par3) @@ -880,11 +880,11 @@ public class GuiIngame extends Gui par1 = par1 * 0.8F + 0.2F; } - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(false); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, par1); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, par1); Icon var4 = Block.portal.getBlockTextureFromSide(1); TextureMap.locationBlocksTexture.bindTexture(); float var5 = var4.getMinU(); @@ -898,10 +898,10 @@ public class GuiIngame extends Gui var9.addVertexWithUV((double)par2, 0.0D, -90.0D, (double)var7, (double)var6); var9.addVertexWithUV(0.0D, 0.0D, -90.0D, (double)var5, (double)var6); var9.draw(); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } /** @@ -917,18 +917,18 @@ public class GuiIngame extends Gui if (var6 > 0.0F) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var7 = 1.0F + var6 / 5.0F; - GL11.glTranslatef((float)(par2 + 8), (float)(par3 + 12), 0.0F); - GL11.glScalef(1.0F / var7, (var7 + 1.0F) / 2.0F, 1.0F); - GL11.glTranslatef((float)(-(par2 + 8)), (float)(-(par3 + 12)), 0.0F); + EaglerAdapter.glTranslatef((float)(par2 + 8), (float)(par3 + 12), 0.0F); + EaglerAdapter.glScalef(1.0F / var7, (var7 + 1.0F) / 2.0F, 1.0F); + EaglerAdapter.glTranslatef((float)(-(par2 + 8)), (float)(-(par3 + 12)), 0.0F); } itemRenderer.renderItemAndEffectIntoGUI(this.mc.fontRenderer, this.mc.getTextureManager(), var5, par2, par3); if (var6 > 0.0F) { - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } itemRenderer.renderItemOverlayIntoGUI(this.mc.fontRenderer, this.mc.getTextureManager(), var5, par2, par3); diff --git a/src/main/java/net/minecraft/src/GuiInventory.java b/src/main/java/net/minecraft/src/GuiInventory.java index 791c188..189a054 100644 --- a/src/main/java/net/minecraft/src/GuiInventory.java +++ b/src/main/java/net/minecraft/src/GuiInventory.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiInventory extends InventoryEffectRenderer @@ -73,7 +73,7 @@ public class GuiInventory extends InventoryEffectRenderer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); field_110408_a.bindTexture(); int var4 = this.guiLeft; int var5 = this.guiTop; @@ -83,26 +83,26 @@ public class GuiInventory extends InventoryEffectRenderer public static void func_110423_a(int par0, int par1, int par2, float par3, float par4, EntityLivingBase par5EntityLivingBase) { - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par0, (float)par1, 50.0F); - GL11.glScalef((float)(-par2), (float)par2, (float)par2); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par0, (float)par1, 50.0F); + EaglerAdapter.glScalef((float)(-par2), (float)par2, (float)par2); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); float var6 = par5EntityLivingBase.renderYawOffset; float var7 = par5EntityLivingBase.rotationYaw; float var8 = par5EntityLivingBase.rotationPitch; float var9 = par5EntityLivingBase.prevRotationYawHead; float var10 = par5EntityLivingBase.rotationYawHead; - GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-((float)Math.atan((double)(par4 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-((float)Math.atan((double)(par4 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); par5EntityLivingBase.renderYawOffset = (float)Math.atan((double)(par3 / 40.0F)) * 20.0F; par5EntityLivingBase.rotationYaw = (float)Math.atan((double)(par3 / 40.0F)) * 40.0F; par5EntityLivingBase.rotationPitch = -((float)Math.atan((double)(par4 / 40.0F))) * 20.0F; par5EntityLivingBase.rotationYawHead = par5EntityLivingBase.rotationYaw; par5EntityLivingBase.prevRotationYawHead = par5EntityLivingBase.rotationYaw; - GL11.glTranslatef(0.0F, par5EntityLivingBase.yOffset, 0.0F); + EaglerAdapter.glTranslatef(0.0F, par5EntityLivingBase.yOffset, 0.0F); RenderManager.instance.playerViewY = 180.0F; RenderManager.instance.renderEntityWithPosYaw(par5EntityLivingBase, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); par5EntityLivingBase.renderYawOffset = var6; @@ -110,11 +110,11 @@ public class GuiInventory extends InventoryEffectRenderer par5EntityLivingBase.rotationPitch = var8; par5EntityLivingBase.prevRotationYawHead = var9; par5EntityLivingBase.rotationYawHead = var10; - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); } diff --git a/src/main/java/net/minecraft/src/GuiMerchant.java b/src/main/java/net/minecraft/src/GuiMerchant.java index bac6bbe..61d6f18 100644 --- a/src/main/java/net/minecraft/src/GuiMerchant.java +++ b/src/main/java/net/minecraft/src/GuiMerchant.java @@ -4,7 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiMerchant extends GuiContainer @@ -104,7 +104,7 @@ public class GuiMerchant extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); merchantGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; @@ -119,8 +119,8 @@ public class GuiMerchant extends GuiContainer if (var8.func_82784_g()) { merchantGuiTextures.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); this.drawTexturedModalRect(this.guiLeft + 83, this.guiTop + 21, 212, 0, 28, 21); this.drawTexturedModalRect(this.guiLeft + 83, this.guiTop + 51, 212, 0, 28, 21); } @@ -141,15 +141,15 @@ public class GuiMerchant extends GuiContainer int var6 = (this.height - this.ySize) / 2; int var7 = this.currentRecipeIndex; MerchantRecipe var8 = (MerchantRecipe)var4.get(var7); - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); ItemStack var9 = var8.getItemToBuy(); ItemStack var10 = var8.getSecondItemToBuy(); ItemStack var11 = var8.getItemToSell(); RenderHelper.enableGUIStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); itemRenderer.zLevel = 100.0F; itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var9, var5 + 36, var6 + 24); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var9, var5 + 36, var6 + 24); @@ -163,7 +163,7 @@ public class GuiMerchant extends GuiContainer itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var11, var5 + 120, var6 + 24); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var11, var5 + 120, var6 + 24); itemRenderer.zLevel = 0.0F; - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); if (this.isPointInRegion(36, 24, 16, 16, par1, par2)) { @@ -178,9 +178,9 @@ public class GuiMerchant extends GuiContainer this.drawItemStackTooltip(var11, par1, par2); } - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); RenderHelper.enableStandardItemLighting(); } } diff --git a/src/main/java/net/minecraft/src/GuiNewChat.java b/src/main/java/net/minecraft/src/GuiNewChat.java index 0c60049..f989829 100644 --- a/src/main/java/net/minecraft/src/GuiNewChat.java +++ b/src/main/java/net/minecraft/src/GuiNewChat.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiNewChat extends Gui { @@ -43,9 +43,9 @@ public class GuiNewChat extends Gui float var7 = this.func_96131_h(); int var8 = MathHelper.ceiling_float_int((float)this.func_96126_f() / var7); - GL11.glPushMatrix(); - GL11.glTranslatef(2.0F, 20.0F, 0.0F); - GL11.glScalef(var7, var7, 1.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(2.0F, 20.0F, 0.0F); + EaglerAdapter.glScalef(var7, var7, 1.0F); int var9; int var11; int var14; @@ -90,7 +90,7 @@ public class GuiNewChat extends Gui byte var15 = 0; int var16 = -var9 * 9; drawRect(var15, var16 - 9, var15 + var8 + 4, var16, var14 / 2 << 24); - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); String var17 = var10.getChatLineString(); if (!this.mc.gameSettings.chatColours) @@ -107,7 +107,7 @@ public class GuiNewChat extends Gui if (var3) { var9 = this.mc.fontRenderer.FONT_HEIGHT; - GL11.glTranslatef(-3.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(-3.0F, 0.0F, 0.0F); int var18 = var5 * var9 + var5; var11 = var4 * var9 + var4; int var19 = this.field_73768_d * var11 / var5; @@ -122,7 +122,7 @@ public class GuiNewChat extends Gui } } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } } diff --git a/src/main/java/net/minecraft/src/GuiRepair.java b/src/main/java/net/minecraft/src/GuiRepair.java index bad8515..f79f548 100644 --- a/src/main/java/net/minecraft/src/GuiRepair.java +++ b/src/main/java/net/minecraft/src/GuiRepair.java @@ -4,7 +4,7 @@ import java.util.List; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiRepair extends GuiContainer implements ICrafting { @@ -53,7 +53,7 @@ public class GuiRepair extends GuiContainer implements ICrafting */ protected void drawGuiContainerForegroundLayer(int par1, int par2) { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); this.fontRenderer.drawString(I18n.getString("container.repair"), 60, 6, 4210752); if (this.repairContainer.maximumCost > 0) @@ -98,7 +98,7 @@ public class GuiRepair extends GuiContainer implements ICrafting } } - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } /** @@ -145,7 +145,7 @@ public class GuiRepair extends GuiContainer implements ICrafting public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); this.itemNameField.drawTextBox(); } @@ -154,7 +154,7 @@ public class GuiRepair extends GuiContainer implements ICrafting */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); anvilGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiScreenBook.java b/src/main/java/net/minecraft/src/GuiScreenBook.java index 5f70fd1..54caec2 100644 --- a/src/main/java/net/minecraft/src/GuiScreenBook.java +++ b/src/main/java/net/minecraft/src/GuiScreenBook.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiScreenBook extends GuiScreen { @@ -375,7 +375,7 @@ public class GuiScreenBook extends GuiScreen */ public void drawScreen(int par1, int par2, float par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); bookGuiTextures.bindTexture(); int var4 = (this.width - this.bookImageWidth) / 2; byte var5 = 2; diff --git a/src/main/java/net/minecraft/src/GuiScreenHorseInventory.java b/src/main/java/net/minecraft/src/GuiScreenHorseInventory.java index ec4f3aa..2b69856 100644 --- a/src/main/java/net/minecraft/src/GuiScreenHorseInventory.java +++ b/src/main/java/net/minecraft/src/GuiScreenHorseInventory.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiScreenHorseInventory extends GuiContainer { @@ -35,7 +35,7 @@ public class GuiScreenHorseInventory extends GuiContainer */ protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); horseGuiTextures.bindTexture(); int var4 = (this.width - this.xSize) / 2; int var5 = (this.height - this.ySize) / 2; diff --git a/src/main/java/net/minecraft/src/GuiScreenSelectLocation.java b/src/main/java/net/minecraft/src/GuiScreenSelectLocation.java index 4c3f65a..530ed64 100644 --- a/src/main/java/net/minecraft/src/GuiScreenSelectLocation.java +++ b/src/main/java/net/minecraft/src/GuiScreenSelectLocation.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public abstract class GuiScreenSelectLocation { @@ -245,11 +245,11 @@ public abstract class GuiScreenSelectLocation } this.func_104091_h(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_FOG); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_FOG); Tessellator var18 = Tessellator.instance; Gui.optionsBackground.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var17 = 32.0F; var18.startDrawingQuads(); var18.setColorOpaque_I(2105376); @@ -281,8 +281,8 @@ public abstract class GuiScreenSelectLocation { var14 = this.field_104093_g / 2 - 110; var15 = this.field_104093_g / 2 + 110; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorOpaque_I(0); var18.addVertexWithUV((double)var14, (double)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); @@ -290,15 +290,15 @@ public abstract class GuiScreenSelectLocation var18.addVertexWithUV((double)var15, (double)(var20 - 2), 0.0D, 1.0D, 0.0D); var18.addVertexWithUV((double)var14, (double)(var20 - 2), 0.0D, 0.0D, 0.0D); var18.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } if (this.field_104109_r && this.isSelected(var11)) { var14 = this.field_104093_g / 2 - 110; var15 = this.field_104093_g / 2 + 110; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorOpaque_I(8421504); var18.addVertexWithUV((double)var14, (double)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); @@ -311,22 +311,22 @@ public abstract class GuiScreenSelectLocation var18.addVertexWithUV((double)(var15 - 1), (double)(var20 - 1), 0.0D, 1.0D, 0.0D); var18.addVertexWithUV((double)(var14 + 1), (double)(var20 - 1), 0.0D, 0.0D, 0.0D); var18.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } this.drawSlot(var11, var9, var20, var13, var18); } } - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); byte var19 = 4; this.func_104083_b(0, this.field_104098_a, 255, 255); this.func_104083_b(this.field_104096_b, this.field_104105_h, 255, 255); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorRGBA_I(0, 0); var18.addVertexWithUV((double)this.field_104103_j, (double)(this.field_104098_a + var19), 0.0D, 0.0D, 1.0D); @@ -390,10 +390,10 @@ public abstract class GuiScreenSelectLocation } this.func_104087_b(par1, par2); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } protected int func_104090_g() @@ -405,7 +405,7 @@ public abstract class GuiScreenSelectLocation { Tessellator var5 = Tessellator.instance; Gui.optionsBackground.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var6 = 32.0F; var5.startDrawingQuads(); var5.setColorRGBA_I(4210752, par4); diff --git a/src/main/java/net/minecraft/src/GuiSlider.java b/src/main/java/net/minecraft/src/GuiSlider.java index a99b030..af4690b 100644 --- a/src/main/java/net/minecraft/src/GuiSlider.java +++ b/src/main/java/net/minecraft/src/GuiSlider.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiSlider extends GuiButton { @@ -54,7 +54,7 @@ public class GuiSlider extends GuiButton this.displayString = par1Minecraft.gameSettings.getKeyBinding(this.idFloat); } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.drawTexturedModalRect(this.xPosition + (int)(this.sliderValue * (float)(this.width - 8)), this.yPosition, 0, 66, 4, 20); this.drawTexturedModalRect(this.xPosition + (int)(this.sliderValue * (float)(this.width - 8)) + 4, this.yPosition, 196, 66, 4, 20); } diff --git a/src/main/java/net/minecraft/src/GuiSlot.java b/src/main/java/net/minecraft/src/GuiSlot.java index d7ef257..be15de5 100644 --- a/src/main/java/net/minecraft/src/GuiSlot.java +++ b/src/main/java/net/minecraft/src/GuiSlot.java @@ -1,7 +1,7 @@ package net.minecraft.src; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.adapter.Tessellator; public abstract class GuiSlot @@ -324,11 +324,11 @@ public abstract class GuiSlot } this.bindAmountScrolled(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_FOG); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_FOG); Tessellator var18 = Tessellator.instance; Gui.optionsBackground.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var17 = 32.0F; var18.startDrawingQuads(); var18.setColorOpaque_I(2105376); @@ -358,8 +358,8 @@ public abstract class GuiSlot { var14 = this.width / 2 - 110; int var15 = this.width / 2 + 110; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorOpaque_I(8421504); var18.addVertexWithUV((double)var14, (double)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); @@ -372,22 +372,22 @@ public abstract class GuiSlot var18.addVertexWithUV((double)(var15 - 1), (double)(var20 - 1), 0.0D, 1.0D, 0.0D); var18.addVertexWithUV((double)(var14 + 1), (double)(var20 - 1), 0.0D, 0.0D, 0.0D); var18.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } this.drawSlot(var11, var9, var20, var13, var18); } } - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); byte var19 = 4; this.overlayBackground(0, this.top, 255, 255); this.overlayBackground(this.bottom, this.height, 255, 255); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorRGBA_I(0, 0); var18.addVertexWithUV((double)this.left, (double)(this.top + var19), 0.0D, 0.0D, 1.0D); @@ -451,10 +451,10 @@ public abstract class GuiSlot } this.func_77215_b(par1, par2); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } protected int getScrollBarX() @@ -469,7 +469,7 @@ public abstract class GuiSlot { Tessellator var5 = Tessellator.instance; Gui.optionsBackground.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var6 = 32.0F; var5.startDrawingQuads(); var5.setColorRGBA_I(4210752, par4); diff --git a/src/main/java/net/minecraft/src/GuiSlotServer.java b/src/main/java/net/minecraft/src/GuiSlotServer.java index 3336d02..874f8d9 100644 --- a/src/main/java/net/minecraft/src/GuiSlotServer.java +++ b/src/main/java/net/minecraft/src/GuiSlotServer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.adapter.Tessellator; class GuiSlotServer extends GuiSlot diff --git a/src/main/java/net/minecraft/src/GuiStats.java b/src/main/java/net/minecraft/src/GuiStats.java index 2ff1b83..5e71ec5 100644 --- a/src/main/java/net/minecraft/src/GuiStats.java +++ b/src/main/java/net/minecraft/src/GuiStats.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class GuiStats extends GuiScreen @@ -116,11 +116,11 @@ public class GuiStats extends GuiScreen private void drawItemSprite(int par1, int par2, int par3) { this.drawButtonBackground(par1 + 1, par2 + 1); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); RenderHelper.enableGUIStandardItemLighting(); renderItem.renderItemIntoGUI(this.fontRenderer, this.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } /** @@ -136,7 +136,7 @@ public class GuiStats extends GuiScreen */ private void drawSprite(int par1, int par2, int par3, int par4) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); statIcons.bindTexture(); float var5 = 0.0078125F; float var6 = 0.0078125F; diff --git a/src/main/java/net/minecraft/src/GuiTextField.java b/src/main/java/net/minecraft/src/GuiTextField.java index e5181ba..0c85525 100644 --- a/src/main/java/net/minecraft/src/GuiTextField.java +++ b/src/main/java/net/minecraft/src/GuiTextField.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiTextField extends Gui { @@ -565,18 +565,18 @@ public class GuiTextField extends Gui } Tessellator var6 = Tessellator.instance; - GL11.glColor4f(0.0F, 0.0F, 255.0F, 255.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_COLOR_LOGIC_OP); - GL11.glLogicOp(GL11.GL_OR_REVERSE); + EaglerAdapter.glColor4f(0.0F, 0.0F, 255.0F, 255.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_LOGIC_OP); + EaglerAdapter.glLogicOp(EaglerAdapter.GL_OR_REVERSE); var6.startDrawingQuads(); var6.addVertex((double)par1, (double)par4, 0.0D); var6.addVertex((double)par3, (double)par4, 0.0D); var6.addVertex((double)par3, (double)par2, 0.0D); var6.addVertex((double)par1, (double)par2, 0.0D); var6.draw(); - GL11.glDisable(GL11.GL_COLOR_LOGIC_OP); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_COLOR_LOGIC_OP); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } public void setMaxStringLength(int par1) diff --git a/src/main/java/net/minecraft/src/GuiWinGame.java b/src/main/java/net/minecraft/src/GuiWinGame.java index bd603ce..82c2021 100644 --- a/src/main/java/net/minecraft/src/GuiWinGame.java +++ b/src/main/java/net/minecraft/src/GuiWinGame.java @@ -9,7 +9,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; import org.apache.commons.io.Charsets; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class GuiWinGame extends GuiScreen { @@ -169,10 +169,10 @@ public class GuiWinGame extends GuiScreen int var6 = this.width / 2 - var5 / 2; int var7 = this.height + 50; float var8 = -((float)this.updateCounter + par3) * this.field_73987_d; - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, var8, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, var8, 0.0F); minecraftLogoTexture.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.drawTexturedModalRect(var6, var7, 0, 0, 155, 44); this.drawTexturedModalRect(var6 + 155, var7, 0, 45, 155, 44); var4.setColorOpaque_I(16777215); @@ -187,7 +187,7 @@ public class GuiWinGame extends GuiScreen if (var11 < 0.0F) { - GL11.glTranslatef(0.0F, -var11, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -var11, 0.0F); } } @@ -209,10 +209,10 @@ public class GuiWinGame extends GuiScreen var9 += 12; } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); field_110361_b.bindTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_COLOR); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ZERO, EaglerAdapter.GL_ONE_MINUS_SRC_COLOR); var4.startDrawingQuads(); var4.setColorRGBA_F(1.0F, 1.0F, 1.0F, 1.0F); var10 = this.width; @@ -222,7 +222,7 @@ public class GuiWinGame extends GuiScreen var4.addVertexWithUV((double)var10, 0.0D, (double)this.zLevel, 1.0D, 0.0D); var4.addVertexWithUV(0.0D, 0.0D, (double)this.zLevel, 0.0D, 0.0D); var4.draw(); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); super.drawScreen(par1, par2, par3); } } diff --git a/src/main/java/net/minecraft/src/InventoryEffectRenderer.java b/src/main/java/net/minecraft/src/InventoryEffectRenderer.java index b261f23..91f8049 100644 --- a/src/main/java/net/minecraft/src/InventoryEffectRenderer.java +++ b/src/main/java/net/minecraft/src/InventoryEffectRenderer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Collection; import java.util.Iterator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public abstract class InventoryEffectRenderer extends GuiContainer { @@ -52,8 +52,8 @@ public abstract class InventoryEffectRenderer extends GuiContainer if (!var4.isEmpty()) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); int var5 = 33; if (var4.size() > 5) @@ -65,7 +65,7 @@ public abstract class InventoryEffectRenderer extends GuiContainer { PotionEffect var7 = (PotionEffect)var6.next(); Potion var8 = Potion.potionTypes[var7.getPotionID()]; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); field_110408_a.bindTexture(); this.drawTexturedModalRect(var1, var2, 0, 166, 140, 32); diff --git a/src/main/java/net/minecraft/src/ItemRenderer.java b/src/main/java/net/minecraft/src/ItemRenderer.java index 388bbb6..11fe594 100644 --- a/src/main/java/net/minecraft/src/ItemRenderer.java +++ b/src/main/java/net/minecraft/src/ItemRenderer.java @@ -3,7 +3,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class ItemRenderer @@ -42,7 +42,7 @@ public class ItemRenderer */ public void renderItem(EntityLivingBase par1EntityLivingBase, ItemStack par2ItemStack, int par3) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); RenderEngine var4 = this.mc.getTextureManager(); if (par2ItemStack.getItemSpriteNumber() == 0 && Block.blocksList[par2ItemStack.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType())) { @@ -57,7 +57,7 @@ public class ItemRenderer if (var5 == null) { - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); return; } @@ -76,50 +76,50 @@ public class ItemRenderer float var10 = var5.getMaxV(); float var11 = 0.0F; float var12 = 0.3F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glTranslatef(-var11, -var12, 0.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef(-var11, -var12, 0.0F); float var13 = 1.5F; - GL11.glScalef(var13, var13, var13); - GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); + EaglerAdapter.glScalef(var13, var13, var13); + EaglerAdapter.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(-0.9375F, -0.0625F, 0.0F); renderItemIn2D(var6, var8, var9, var7, var10, var5.getIconWidth(), var5.getIconHeight(), 0.0625F); if (par2ItemStack.hasEffect() && par3 == 0) { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); RES_ITEM_GLINT.bindTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_COLOR, EaglerAdapter.GL_ONE); float var14 = 0.76F; - GL11.glColor4f(0.5F * var14, 0.25F * var14, 0.8F * var14, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); + EaglerAdapter.glColor4f(0.5F * var14, 0.25F * var14, 0.8F * var14, 1.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glPushMatrix(); float var15 = 0.125F; - GL11.glScalef(var15, var15, var15); + EaglerAdapter.glScalef(var15, var15, var15); float var16 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(var16, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(var16, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); renderItemIn2D(var6, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(var15, var15, var15); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(var15, var15, var15); var16 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-var16, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(-var16, 0.0F, 0.0F); + EaglerAdapter.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); renderItemIn2D(var6, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } /** @@ -215,16 +215,16 @@ public class ItemRenderer float var2 = this.prevEquippedProgress + (this.equippedProgress - this.prevEquippedProgress) * par1; EntityClientPlayerMP var3 = this.mc.thePlayer; float var4 = var3.prevRotationPitch + (var3.rotationPitch - var3.prevRotationPitch) * par1; - GL11.glPushMatrix(); - GL11.glRotatef(var4, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(var3.prevRotationYaw + (var3.rotationYaw - var3.prevRotationYaw) * par1, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glRotatef(var4, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(var3.prevRotationYaw + (var3.rotationYaw - var3.prevRotationYaw) * par1, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); EntityPlayerSP var5 = (EntityPlayerSP)var3; float var6 = var5.prevRenderArmPitch + (var5.renderArmPitch - var5.prevRenderArmPitch) * par1; float var7 = var5.prevRenderArmYaw + (var5.renderArmYaw - var5.prevRenderArmYaw) * par1; - GL11.glRotatef((var3.rotationPitch - var6) * 0.1F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef((var3.rotationYaw - var7) * 0.1F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef((var3.rotationPitch - var6) * 0.1F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef((var3.rotationYaw - var7) * 0.1F, 0.0F, 1.0F, 0.0F); ItemStack var8 = this.itemToRender; float var9 = this.mc.theWorld.getLightBrightness(MathHelper.floor_double(var3.posX), MathHelper.floor_double(var3.posY), MathHelper.floor_double(var3.posZ)); var9 = 1.0F; @@ -232,7 +232,7 @@ public class ItemRenderer int var11 = var10 % 65536; int var12 = var10 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var11 / 1.0F, (float)var12 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var13; float var21; float var23; @@ -243,11 +243,11 @@ public class ItemRenderer var21 = (float)(var10 >> 16 & 255) / 255.0F; var23 = (float)(var10 >> 8 & 255) / 255.0F; var13 = (float)(var10 & 255) / 255.0F; - GL11.glColor4f(var9 * var21, var9 * var23, var9 * var13, 1.0F); + EaglerAdapter.glColor4f(var9 * var21, var9 * var23, var9 * var13, 1.0F); } else { - GL11.glColor4f(var9, var9, var9, 1.0F); + EaglerAdapter.glColor4f(var9, var9, var9, 1.0F); } float var14; @@ -259,12 +259,12 @@ public class ItemRenderer if (var8 != null && var8.itemID == Item.map.itemID) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); var20 = 0.8F; var21 = var3.getSwingProgress(par1); var23 = MathHelper.sin(var21 * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); - GL11.glTranslatef(-var13 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.2F, -var23 * 0.2F); + EaglerAdapter.glTranslatef(-var13 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.2F, -var23 * 0.2F); var21 = 1.0F - var4 / 45.0F + 0.1F; if (var21 < 0.0F) @@ -278,45 +278,45 @@ public class ItemRenderer } var21 = -MathHelper.cos(var21 * (float)Math.PI) * 0.5F + 0.5F; - GL11.glTranslatef(0.0F, 0.0F * var20 - (1.0F - var2) * 1.2F - var21 * 0.5F + 0.04F, -0.9F * var20); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var21 * -85.0F, 0.0F, 0.0F, 1.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef(0.0F, 0.0F * var20 - (1.0F - var2) * 1.2F - var21 * 0.5F + 0.04F, -0.9F * var20); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var21 * -85.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); var28.bindTexture(var3); for (var12 = 0; var12 < 2; ++var12) { int var24 = var12 * 2 - 1; - GL11.glPushMatrix(); - GL11.glTranslatef(-0.0F, -0.6F, 1.1F * (float)var24); - GL11.glRotatef((float)(-45 * var24), 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(59.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef((float)(-65 * var24), 0.0F, 1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(-0.0F, -0.6F, 1.1F * (float)var24); + EaglerAdapter.glRotatef((float)(-45 * var24), 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(59.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef((float)(-65 * var24), 0.0F, 1.0F, 0.0F); var26 = RenderManager.instance.getEntityRenderObject(this.mc.thePlayer); var28 = (RenderPlayer)var26; var16 = 1.0F; - GL11.glScalef(var16, var16, var16); + EaglerAdapter.glScalef(var16, var16, var16); var28.renderFirstPersonArm(this.mc.thePlayer); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } var23 = var3.getSwingProgress(par1); var13 = MathHelper.sin(var23 * var23 * (float)Math.PI); var14 = MathHelper.sin(MathHelper.sqrt_float(var23) * (float)Math.PI); - GL11.glRotatef(-var13 * 20.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-var14 * 20.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-var14 * 80.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-var13 * 20.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var14 * 20.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-var14 * 80.0F, 1.0F, 0.0F, 0.0F); var15 = 0.38F; - GL11.glScalef(var15, var15, var15); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-1.0F, -1.0F, 0.0F); + EaglerAdapter.glScalef(var15, var15, var15); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(-1.0F, -1.0F, 0.0F); var16 = 0.015625F; - GL11.glScalef(var16, var16, var16); + EaglerAdapter.glScalef(var16, var16, var16); RES_MAP_BACKGROUND.bindTexture(); Tessellator var29 = Tessellator.instance; - GL11.glNormal3f(0.0F, 0.0F, -1.0F); + EaglerAdapter.glNormal3f(0.0F, 0.0F, -1.0F); var29.startDrawingQuads(); byte var30 = 7; var29.addVertexWithUV((double)(0 - var30), (double)(128 + var30), 0.0D, 0.0D, 1.0D); @@ -331,11 +331,11 @@ public class ItemRenderer this.mapItemRenderer.renderMap(this.mc.thePlayer, this.mc.getTextureManager(), var19); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else if (var8 != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); var20 = 0.8F; if (var3.getItemInUseCount() > 0) @@ -351,11 +351,11 @@ public class ItemRenderer var14 = var14 * var14 * var14; var14 = var14 * var14 * var14; var15 = 1.0F - var14; - GL11.glTranslatef(0.0F, MathHelper.abs(MathHelper.cos(var23 / 4.0F * (float)Math.PI) * 0.1F) * (float)((double)var13 > 0.2D ? 1 : 0), 0.0F); - GL11.glTranslatef(var15 * 0.6F, -var15 * 0.5F, 0.0F); - GL11.glRotatef(var15 * 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var15 * 10.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(var15 * 30.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, MathHelper.abs(MathHelper.cos(var23 / 4.0F * (float)Math.PI) * 0.1F) * (float)((double)var13 > 0.2D ? 1 : 0), 0.0F); + EaglerAdapter.glTranslatef(var15 * 0.6F, -var15 * 0.5F, 0.0F); + EaglerAdapter.glRotatef(var15 * 90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var15 * 10.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(var15 * 30.0F, 0.0F, 0.0F, 1.0F); } } else @@ -363,20 +363,20 @@ public class ItemRenderer var21 = var3.getSwingProgress(par1); var23 = MathHelper.sin(var21 * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); - GL11.glTranslatef(-var13 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.2F, -var23 * 0.2F); + EaglerAdapter.glTranslatef(-var13 * 0.4F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.2F, -var23 * 0.2F); } - GL11.glTranslatef(0.7F * var20, -0.65F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef(0.7F * var20, -0.65F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); var21 = var3.getSwingProgress(par1); var23 = MathHelper.sin(var21 * var21 * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); - GL11.glRotatef(-var23 * 20.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-var13 * 20.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-var13 * 80.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-var23 * 20.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var13 * 20.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-var13 * 80.0F, 1.0F, 0.0F, 0.0F); var14 = 0.4F; - GL11.glScalef(var14, var14, var14); + EaglerAdapter.glScalef(var14, var14, var14); float var17; float var18; @@ -386,17 +386,17 @@ public class ItemRenderer if (var25 == EnumAction.block) { - GL11.glTranslatef(-0.5F, 0.2F, 0.0F); - GL11.glRotatef(30.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-80.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.5F, 0.2F, 0.0F); + EaglerAdapter.glRotatef(30.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-80.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); } else if (var25 == EnumAction.bow) { - GL11.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-12.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-8.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(-0.9F, 0.2F, 0.0F); + EaglerAdapter.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-12.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-8.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.9F, 0.2F, 0.0F); var16 = (float)var8.getMaxItemUseDuration() - ((float)var3.getItemInUseCount() - par1 + 1.0F); var17 = var16 / 20.0F; var17 = (var17 * var17 + var17 * 2.0F) / 3.0F; @@ -408,24 +408,24 @@ public class ItemRenderer if (var17 > 0.1F) { - GL11.glTranslatef(0.0F, MathHelper.sin((var16 - 0.1F) * 1.3F) * 0.01F * (var17 - 0.1F), 0.0F); + EaglerAdapter.glTranslatef(0.0F, MathHelper.sin((var16 - 0.1F) * 1.3F) * 0.01F * (var17 - 0.1F), 0.0F); } - GL11.glTranslatef(0.0F, 0.0F, var17 * 0.1F); - GL11.glRotatef(-335.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-50.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.5F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.0F, var17 * 0.1F); + EaglerAdapter.glRotatef(-335.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-50.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.5F, 0.0F); var18 = 1.0F + var17 * 0.2F; - GL11.glScalef(1.0F, 1.0F, var18); - GL11.glTranslatef(0.0F, -0.5F, 0.0F); - GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glScalef(1.0F, 1.0F, var18); + EaglerAdapter.glTranslatef(0.0F, -0.5F, 0.0F); + EaglerAdapter.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); } } if (var8.getItem().shouldRotateAroundWhenRendering()) { - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); } if (var8.getItem().requiresMultipleRenderPasses()) @@ -435,7 +435,7 @@ public class ItemRenderer var16 = (float)(var27 >> 16 & 255) / 255.0F; var17 = (float)(var27 >> 8 & 255) / 255.0F; var18 = (float)(var27 & 255) / 255.0F; - GL11.glColor4f(var9 * var16, var9 * var17, var9 * var18, 1.0F); + EaglerAdapter.glColor4f(var9 * var16, var9 * var17, var9 * var18, 1.0F); this.renderItem(var3, var8, 1); } else @@ -443,40 +443,40 @@ public class ItemRenderer this.renderItem(var3, var8, 0); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else if (!var3.isInvisible()) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); var20 = 0.8F; var21 = var3.getSwingProgress(par1); var23 = MathHelper.sin(var21 * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); - GL11.glTranslatef(-var13 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.4F, -var23 * 0.4F); - GL11.glTranslatef(0.8F * var20, -0.75F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef(-var13 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.4F, -var23 * 0.4F); + EaglerAdapter.glTranslatef(0.8F * var20, -0.75F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); var21 = var3.getSwingProgress(par1); var23 = MathHelper.sin(var21 * var21 * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); - GL11.glRotatef(var13 * 70.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-var23 * 20.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var13 * 70.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var23 * 20.0F, 0.0F, 0.0F, 1.0F); var28.bindTexture(var3); - GL11.glTranslatef(-1.0F, 3.6F, 3.5F); - GL11.glRotatef(120.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(200.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(1.0F, 1.0F, 1.0F); - GL11.glTranslatef(5.6F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(-1.0F, 3.6F, 3.5F); + EaglerAdapter.glRotatef(120.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(200.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(1.0F, 1.0F, 1.0F); + EaglerAdapter.glTranslatef(5.6F, 0.0F, 0.0F); var26 = RenderManager.instance.getEntityRenderObject(this.mc.thePlayer); var28 = (RenderPlayer)var26; var16 = 1.0F; - GL11.glScalef(var16, var16, var16); + EaglerAdapter.glScalef(var16, var16, var16); var28.renderFirstPersonArm(this.mc.thePlayer); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); } @@ -485,7 +485,7 @@ public class ItemRenderer */ public void renderOverlays(float par1) { - GL11.glDisable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); if (this.mc.thePlayer.isBurning()) { @@ -532,7 +532,7 @@ public class ItemRenderer this.renderWarpedTextureOverlay(par1); } - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); } /** @@ -543,8 +543,8 @@ public class ItemRenderer TextureMap.locationBlocksTexture.bindTexture(); Tessellator var3 = Tessellator.instance; float var4 = 0.1F; - GL11.glColor4f(var4, var4, var4, 0.5F); - GL11.glPushMatrix(); + EaglerAdapter.glColor4f(var4, var4, var4, 0.5F); + EaglerAdapter.glPushMatrix(); float var5 = -1.0F; float var6 = 1.0F; float var7 = -1.0F; @@ -560,8 +560,8 @@ public class ItemRenderer var3.addVertexWithUV((double)var6, (double)var8, (double)var9, (double)var10, (double)var12); var3.addVertexWithUV((double)var5, (double)var8, (double)var9, (double)var11, (double)var12); var3.draw(); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } /** @@ -573,10 +573,10 @@ public class ItemRenderer RES_UNDERWATER_OVERLAY.bindTexture(); Tessellator var2 = Tessellator.instance; float var3 = this.mc.thePlayer.getBrightness(par1); - GL11.glColor4f(var3, var3, var3, 0.5F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glPushMatrix(); + EaglerAdapter.glColor4f(var3, var3, var3, 0.5F); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glPushMatrix(); float var4 = 4.0F; float var5 = -1.0F; float var6 = 1.0F; @@ -591,9 +591,9 @@ public class ItemRenderer var2.addVertexWithUV((double)var6, (double)var8, (double)var9, (double)(0.0F + var10), (double)(0.0F + var11)); var2.addVertexWithUV((double)var5, (double)var8, (double)var9, (double)(var4 + var10), (double)(0.0F + var11)); var2.draw(); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } /** diff --git a/src/main/java/net/minecraft/src/LoadingScreenRenderer.java b/src/main/java/net/minecraft/src/LoadingScreenRenderer.java index 468e04b..dd17621 100644 --- a/src/main/java/net/minecraft/src/LoadingScreenRenderer.java +++ b/src/main/java/net/minecraft/src/LoadingScreenRenderer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; import org.lwjgl.opengl.Display; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class LoadingScreenRenderer implements IProgressUpdate { @@ -56,13 +56,13 @@ public class LoadingScreenRenderer implements IProgressUpdate else { ScaledResolution var2 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, var2.getScaledWidth_double(), var2.getScaledHeight_double(), 0.0D, 100.0D, 300.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, 0.0F, -200.0F); + EaglerAdapter.glClear(EaglerAdapter.GL_DEPTH_BUFFER_BIT); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glOrtho(0.0F, var2.getScaledWidth(), var2.getScaledHeight(), 0.0F, 100.0F, 300.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -200.0F); } } @@ -109,14 +109,14 @@ public class LoadingScreenRenderer implements IProgressUpdate ScaledResolution var4 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); int var5 = var4.getScaledWidth(); int var6 = var4.getScaledHeight(); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, var4.getScaledWidth_double(), var4.getScaledHeight_double(), 0.0D, 100.0D, 300.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, 0.0F, -200.0F); - GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); + EaglerAdapter.glClear(EaglerAdapter.GL_DEPTH_BUFFER_BIT); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glOrtho(0.0F, var4.getScaledWidth(), var4.getScaledHeight(), 0.0F, 100.0F, 300.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -200.0F); + EaglerAdapter.glClear(EaglerAdapter.GL_COLOR_BUFFER_BIT | EaglerAdapter.GL_DEPTH_BUFFER_BIT); Tessellator var7 = Tessellator.instance; Gui.optionsBackground.bindTexture(); float var8 = 32.0F; @@ -134,7 +134,7 @@ public class LoadingScreenRenderer implements IProgressUpdate byte var10 = 2; int var11 = var5 / 2 - var9 / 2; int var12 = var6 / 2 + 16; - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var7.startDrawingQuads(); var7.setColorOpaque_I(8421504); var7.addVertex((double)var11, (double)var12, 0.0D); @@ -147,7 +147,7 @@ public class LoadingScreenRenderer implements IProgressUpdate var7.addVertex((double)(var11 + par1), (double)(var12 + var10), 0.0D); var7.addVertex((double)(var11 + par1), (double)var12, 0.0D); var7.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } this.mc.fontRenderer.drawStringWithShadow(this.currentlyDisplayedText, (var5 - this.mc.fontRenderer.getStringWidth(this.currentlyDisplayedText)) / 2, var6 / 2 - 4 - 16, 16777215); diff --git a/src/main/java/net/minecraft/src/MapItemRenderer.java b/src/main/java/net/minecraft/src/MapItemRenderer.java index b2f26ba..c4df058 100644 --- a/src/main/java/net/minecraft/src/MapItemRenderer.java +++ b/src/main/java/net/minecraft/src/MapItemRenderer.java @@ -6,7 +6,7 @@ import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerImage; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class MapItemRenderer { diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index 35ecb8a..a460679 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -23,7 +23,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.Sys; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.util.glu.GLU; public class Minecraft @@ -635,7 +635,7 @@ public class Minecraft */ private void checkGLError(String par1Str) { - int var2 = GL11.glGetError(); + int var2 = EaglerAdapter.glGetError(); if (var2 != 0) { @@ -885,21 +885,21 @@ public class Minecraft { List var3 = this.mcProfiler.getProfilingData(this.debugProfilerName); ProfilerResult var4 = (ProfilerResult)var3.remove(0); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, (double)this.displayWidth, (double)this.displayHeight, 0.0D, 1000.0D, 3000.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, 0.0F, -2000.0F); - GL11.glLineWidth(1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glClear(EaglerAdapter.GL_DEPTH_BUFFER_BIT); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); + EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glOrtho(0.0F, this.displayWidth, this.displayHeight, 0.0F, 1000.0F, 3000.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -2000.0F); + EaglerAdapter.glLineWidth(1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); Tessellator var5 = Tessellator.instance; short var6 = 160; int var7 = this.displayWidth - var6 - 10; int var8 = this.displayHeight - var6 * 2; - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); var5.startDrawingQuads(); var5.setColorRGBA_I(0, 200); var5.addVertex((double)((float)var7 - (float)var6 * 1.1F), (double)((float)var8 - (float)var6 * 0.6F - 16.0F), 0.0D); @@ -907,7 +907,7 @@ public class Minecraft var5.addVertex((double)((float)var7 + (float)var6 * 1.1F), (double)(var8 + var6 * 2), 0.0D); var5.addVertex((double)((float)var7 + (float)var6 * 1.1F), (double)((float)var8 - (float)var6 * 0.6F - 16.0F), 0.0D); var5.draw(); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); double var9 = 0.0D; int var13; @@ -949,7 +949,7 @@ public class Minecraft } DecimalFormat var18 = new DecimalFormat("##0.00"); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); String var19 = ""; if (!var4.field_76331_c.equals("unspecified")) @@ -2068,18 +2068,7 @@ public class Minecraft */ public static int getGLMaximumTextureSize() { - for (int var0 = 16384; var0 > 0; var0 >>= 1) - { - GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, var0, var0, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); - int var1 = GL11.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); - - if (var1 != 0) - { - return var0; - } - } - - return -1; + return 8192; } /** diff --git a/src/main/java/net/minecraft/src/ModelBiped.java b/src/main/java/net/minecraft/src/ModelBiped.java index 4d6419a..174ee54 100644 --- a/src/main/java/net/minecraft/src/ModelBiped.java +++ b/src/main/java/net/minecraft/src/ModelBiped.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelBiped extends ModelBase { @@ -82,21 +82,21 @@ public class ModelBiped extends ModelBase if (this.isChild) { float var8 = 2.0F; - GL11.glPushMatrix(); - GL11.glScalef(1.5F / var8, 1.5F / var8, 1.5F / var8); - GL11.glTranslatef(0.0F, 16.0F * par7, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.5F / var8, 1.5F / var8, 1.5F / var8); + EaglerAdapter.glTranslatef(0.0F, 16.0F * par7, 0.0F); this.bipedHead.render(par7); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); - GL11.glTranslatef(0.0F, 24.0F * par7, 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); + EaglerAdapter.glTranslatef(0.0F, 24.0F * par7, 0.0F); this.bipedBody.render(par7); this.bipedRightArm.render(par7); this.bipedLeftArm.render(par7); this.bipedRightLeg.render(par7); this.bipedLeftLeg.render(par7); this.bipedHeadwear.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { diff --git a/src/main/java/net/minecraft/src/ModelChicken.java b/src/main/java/net/minecraft/src/ModelChicken.java index b04fb2e..845fe50 100644 --- a/src/main/java/net/minecraft/src/ModelChicken.java +++ b/src/main/java/net/minecraft/src/ModelChicken.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelChicken extends ModelBase { @@ -52,21 +52,21 @@ public class ModelChicken extends ModelBase if (this.isChild) { float var8 = 2.0F; - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 5.0F * par7, 2.0F * par7); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, 5.0F * par7, 2.0F * par7); this.head.render(par7); this.bill.render(par7); this.chin.render(par7); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); - GL11.glTranslatef(0.0F, 24.0F * par7, 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); + EaglerAdapter.glTranslatef(0.0F, 24.0F * par7, 0.0F); this.body.render(par7); this.rightLeg.render(par7); this.leftLeg.render(par7); this.rightWing.render(par7); this.leftWing.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { diff --git a/src/main/java/net/minecraft/src/ModelDragon.java b/src/main/java/net/minecraft/src/ModelDragon.java index eac653b..633e7d6 100644 --- a/src/main/java/net/minecraft/src/ModelDragon.java +++ b/src/main/java/net/minecraft/src/ModelDragon.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelDragon extends ModelBase { @@ -134,14 +134,14 @@ public class ModelDragon extends ModelBase */ public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); EntityDragon var8 = (EntityDragon)par1Entity; float var9 = var8.prevAnimTime + (var8.animTime - var8.prevAnimTime) * this.partialTicks; this.jaw.rotateAngleX = (float)(Math.sin((double)(var9 * (float)Math.PI * 2.0F)) + 1.0D) * 0.2F; float var10 = (float)(Math.sin((double)(var9 * (float)Math.PI * 2.0F - 1.0F)) + 1.0D); var10 = (var10 * var10 * 1.0F + var10 * 2.0F) * 0.05F; - GL11.glTranslatef(0.0F, var10 - 2.0F, -3.0F); - GL11.glRotatef(var10 * 2.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, var10 - 2.0F, -3.0F); + EaglerAdapter.glRotatef(var10 * 2.0F, 1.0F, 0.0F, 0.0F); float var11 = -30.0F; float var13 = 0.0F; float var14 = 1.5F; @@ -177,16 +177,16 @@ public class ModelDragon extends ModelBase this.head.rotateAngleY = this.updateRotations(var22[0] - var15[0]) * (float)Math.PI / 180.0F * 1.0F; this.head.rotateAngleZ = -this.updateRotations(var22[0] - (double)var17) * (float)Math.PI / 180.0F * 1.0F; this.head.render(par7); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 1.0F, 0.0F); - GL11.glRotatef(-var16 * var14 * 1.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var16 * var14 * 1.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, -1.0F, 0.0F); this.body.rotateAngleZ = 0.0F; this.body.render(par7); for (int var23 = 0; var23 < 2; ++var23) { - GL11.glEnable(GL11.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); var21 = var9 * (float)Math.PI * 2.0F; this.wing.rotateAngleX = 0.125F - (float)Math.cos((double)var21) * 0.2F; this.wing.rotateAngleY = 0.25F; @@ -201,17 +201,17 @@ public class ModelDragon extends ModelBase this.wing.render(par7); this.frontLeg.render(par7); this.rearLeg.render(par7); - GL11.glScalef(-1.0F, 1.0F, 1.0F); + EaglerAdapter.glScalef(-1.0F, 1.0F, 1.0F); if (var23 == 0) { - GL11.glCullFace(GL11.GL_FRONT); + EaglerAdapter.glCullFace(EaglerAdapter.GL_FRONT); } } - GL11.glPopMatrix(); - GL11.glCullFace(GL11.GL_BACK); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glCullFace(EaglerAdapter.GL_BACK); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); float var24 = -((float)Math.sin((double)(var9 * (float)Math.PI * 2.0F))) * 0.0F; var18 = var9 * (float)Math.PI * 2.0F; var11 = 10.0F; @@ -235,7 +235,7 @@ public class ModelDragon extends ModelBase this.spine.render(par7); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } /** diff --git a/src/main/java/net/minecraft/src/ModelEnderCrystal.java b/src/main/java/net/minecraft/src/ModelEnderCrystal.java index 39aa46e..ee7cb98 100644 --- a/src/main/java/net/minecraft/src/ModelEnderCrystal.java +++ b/src/main/java/net/minecraft/src/ModelEnderCrystal.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelEnderCrystal extends ModelBase { @@ -31,28 +31,28 @@ public class ModelEnderCrystal extends ModelBase */ public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - GL11.glPushMatrix(); - GL11.glScalef(2.0F, 2.0F, 2.0F); - GL11.glTranslatef(0.0F, -0.5F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(2.0F, 2.0F, 2.0F); + EaglerAdapter.glTranslatef(0.0F, -0.5F, 0.0F); if (this.base != null) { this.base.render(par7); } - GL11.glRotatef(par3, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.8F + par4, 0.0F); - GL11.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + EaglerAdapter.glRotatef(par3, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.8F + par4, 0.0F); + EaglerAdapter.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); this.glass.render(par7); float var8 = 0.875F; - GL11.glScalef(var8, var8, var8); - GL11.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); - GL11.glRotatef(par3, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var8, var8, var8); + EaglerAdapter.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + EaglerAdapter.glRotatef(par3, 0.0F, 1.0F, 0.0F); this.glass.render(par7); - GL11.glScalef(var8, var8, var8); - GL11.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); - GL11.glRotatef(par3, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var8, var8, var8); + EaglerAdapter.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + EaglerAdapter.glRotatef(par3, 0.0F, 1.0F, 0.0F); this.cube.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } diff --git a/src/main/java/net/minecraft/src/ModelGhast.java b/src/main/java/net/minecraft/src/ModelGhast.java index 8183572..797587a 100644 --- a/src/main/java/net/minecraft/src/ModelGhast.java +++ b/src/main/java/net/minecraft/src/ModelGhast.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglercraftRandom; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelGhast extends ModelBase { @@ -48,8 +48,8 @@ public class ModelGhast extends ModelBase public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { this.setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.6F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, 0.6F, 0.0F); this.body.render(par7); ModelRenderer[] var8 = this.tentacles; int var9 = var8.length; @@ -60,6 +60,6 @@ public class ModelGhast extends ModelBase var11.render(par7); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } diff --git a/src/main/java/net/minecraft/src/ModelHorse.java b/src/main/java/net/minecraft/src/ModelHorse.java index 63b9ac0..3752459 100644 --- a/src/main/java/net/minecraft/src/ModelHorse.java +++ b/src/main/java/net/minecraft/src/ModelHorse.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelHorse extends ModelBase { @@ -223,9 +223,9 @@ public class ModelHorse extends ModelBase if (!var11) { - GL11.glPushMatrix(); - GL11.glScalef(var15, 0.5F + var15 * 0.5F, var15); - GL11.glTranslatef(0.0F, 0.95F * (1.0F - var15), 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(var15, 0.5F + var15 * 0.5F, var15); + EaglerAdapter.glTranslatef(0.0F, 0.95F * (1.0F - var15), 0.0F); } this.backLeftLeg.render(par7); @@ -243,10 +243,10 @@ public class ModelHorse extends ModelBase if (!var11) { - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(var15, var15, var15); - GL11.glTranslatef(0.0F, 1.35F * (1.0F - var15), 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(var15, var15, var15); + EaglerAdapter.glTranslatef(0.0F, 1.35F * (1.0F - var15), 0.0F); } this.body.render(par7); @@ -258,18 +258,18 @@ public class ModelHorse extends ModelBase if (!var11) { - GL11.glPopMatrix(); - GL11.glPushMatrix(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); float var17 = 0.5F + var15 * var15 * 0.5F; - GL11.glScalef(var17, var17, var17); + EaglerAdapter.glScalef(var17, var17, var17); if (var10 <= 0.0F) { - GL11.glTranslatef(0.0F, 1.35F * (1.0F - var15), 0.0F); + EaglerAdapter.glTranslatef(0.0F, 1.35F * (1.0F - var15), 0.0F); } else { - GL11.glTranslatef(0.0F, 0.9F * (1.0F - var15) * var10 + 1.35F * (1.0F - var15) * (1.0F - var10), 0.15F * (1.0F - var15) * var10); + EaglerAdapter.glTranslatef(0.0F, 0.9F * (1.0F - var15) * var10 + 1.35F * (1.0F - var15) * (1.0F - var10), 0.15F * (1.0F - var15) * var10); } } @@ -288,7 +288,7 @@ public class ModelHorse extends ModelBase if (!var11) { - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } if (var13) diff --git a/src/main/java/net/minecraft/src/ModelOcelot.java b/src/main/java/net/minecraft/src/ModelOcelot.java index 0a33343..d7737a4 100644 --- a/src/main/java/net/minecraft/src/ModelOcelot.java +++ b/src/main/java/net/minecraft/src/ModelOcelot.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelOcelot extends ModelBase { @@ -75,14 +75,14 @@ public class ModelOcelot extends ModelBase if (this.isChild) { float var8 = 2.0F; - GL11.glPushMatrix(); - GL11.glScalef(1.5F / var8, 1.5F / var8, 1.5F / var8); - GL11.glTranslatef(0.0F, 10.0F * par7, 4.0F * par7); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.5F / var8, 1.5F / var8, 1.5F / var8); + EaglerAdapter.glTranslatef(0.0F, 10.0F * par7, 4.0F * par7); this.ocelotHead.render(par7); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); - GL11.glTranslatef(0.0F, 24.0F * par7, 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); + EaglerAdapter.glTranslatef(0.0F, 24.0F * par7, 0.0F); this.ocelotBody.render(par7); this.ocelotBackLeftLeg.render(par7); this.ocelotBackRightLeg.render(par7); @@ -90,7 +90,7 @@ public class ModelOcelot extends ModelBase this.ocelotFrontRightLeg.render(par7); this.ocelotTail.render(par7); this.ocelotTail2.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { diff --git a/src/main/java/net/minecraft/src/ModelQuadruped.java b/src/main/java/net/minecraft/src/ModelQuadruped.java index dee319e..a2769f6 100644 --- a/src/main/java/net/minecraft/src/ModelQuadruped.java +++ b/src/main/java/net/minecraft/src/ModelQuadruped.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelQuadruped extends ModelBase { @@ -44,19 +44,19 @@ public class ModelQuadruped extends ModelBase if (this.isChild) { float var8 = 2.0F; - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, this.field_78145_g * par7, this.field_78151_h * par7); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, this.field_78145_g * par7, this.field_78151_h * par7); this.head.render(par7); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); - GL11.glTranslatef(0.0F, 24.0F * par7, 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); + EaglerAdapter.glTranslatef(0.0F, 24.0F * par7, 0.0F); this.body.render(par7); this.leg1.render(par7); this.leg2.render(par7); this.leg3.render(par7); this.leg4.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { diff --git a/src/main/java/net/minecraft/src/ModelWolf.java b/src/main/java/net/minecraft/src/ModelWolf.java index be98236..71eb66e 100644 --- a/src/main/java/net/minecraft/src/ModelWolf.java +++ b/src/main/java/net/minecraft/src/ModelWolf.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class ModelWolf extends ModelBase { @@ -72,13 +72,13 @@ public class ModelWolf extends ModelBase if (this.isChild) { float var8 = 2.0F; - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 5.0F * par7, 2.0F * par7); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, 5.0F * par7, 2.0F * par7); this.wolfHeadMain.renderWithRotation(par7); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); - GL11.glTranslatef(0.0F, 24.0F * par7, 0.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F / var8, 1.0F / var8, 1.0F / var8); + EaglerAdapter.glTranslatef(0.0F, 24.0F * par7, 0.0F); this.wolfBody.render(par7); this.wolfLeg1.render(par7); this.wolfLeg2.render(par7); @@ -86,7 +86,7 @@ public class ModelWolf extends ModelBase this.wolfLeg4.render(par7); this.wolfTail.renderWithRotation(par7); this.wolfMane.render(par7); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { diff --git a/src/main/java/net/minecraft/src/Render.java b/src/main/java/net/minecraft/src/Render.java index a0a2dcf..24432a2 100644 --- a/src/main/java/net/minecraft/src/Render.java +++ b/src/main/java/net/minecraft/src/Render.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public abstract class Render { @@ -44,21 +44,21 @@ public abstract class Render */ private void renderEntityOnFire(Entity par1Entity, double par2, double par4, double par6, float par8) { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); Icon var9 = Block.fire.getFireIcon(0); Icon var10 = Block.fire.getFireIcon(1); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); float var11 = par1Entity.width * 1.4F; - GL11.glScalef(var11, var11, var11); + EaglerAdapter.glScalef(var11, var11, var11); Tessellator var12 = Tessellator.instance; float var13 = 0.5F; float var14 = 0.0F; float var15 = par1Entity.height / var11; float var16 = (float)(par1Entity.posY - par1Entity.boundingBox.minY); - GL11.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.0F, -0.3F + (float)((int)var15) * 0.02F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -0.3F + (float)((int)var15) * 0.02F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var17 = 0.0F; int var18 = 0; var12.startDrawingQuads(); @@ -91,8 +91,8 @@ public abstract class Render } var12.draw(); - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } /** @@ -101,11 +101,11 @@ public abstract class Render */ private void renderShadow(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); shadowTextures.bindTexture(); World var10 = this.getWorldFromRenderManager(); - GL11.glDepthMask(false); + EaglerAdapter.glDepthMask(false); float var11 = this.shadowSize; if (par1Entity instanceof EntityLiving) @@ -151,9 +151,9 @@ public abstract class Render } var30.draw(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthMask(true); } /** @@ -207,9 +207,9 @@ public abstract class Render */ public static void renderOffsetAABB(AxisAlignedBB par0AxisAlignedBB, double par1, double par3, double par5) { - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); Tessellator var7 = Tessellator.instance; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); var7.startDrawingQuads(); var7.setTranslation(par1, par3, par5); var7.setNormal(0.0F, 0.0F, -1.0F); @@ -244,7 +244,7 @@ public abstract class Render var7.addVertex(par0AxisAlignedBB.maxX, par0AxisAlignedBB.minY, par0AxisAlignedBB.maxZ); var7.setTranslation(0.0D, 0.0D, 0.0D); var7.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } /** diff --git a/src/main/java/net/minecraft/src/RenderArrow.java b/src/main/java/net/minecraft/src/RenderArrow.java index 4d07882..3c5fe3f 100644 --- a/src/main/java/net/minecraft/src/RenderArrow.java +++ b/src/main/java/net/minecraft/src/RenderArrow.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderArrow extends Render @@ -12,10 +12,10 @@ public class RenderArrow extends Render public void renderArrow(EntityArrow par1EntityArrow, double par2, double par4, double par6, float par8, float par9) { this.bindEntityTexture(par1EntityArrow); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glRotatef(par1EntityArrow.prevRotationYaw + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(par1EntityArrow.prevRotationPitch + (par1EntityArrow.rotationPitch - par1EntityArrow.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glRotatef(par1EntityArrow.prevRotationYaw + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(par1EntityArrow.prevRotationPitch + (par1EntityArrow.rotationPitch - par1EntityArrow.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); Tessellator var10 = Tessellator.instance; byte var11 = 0; float var12 = 0.0F; @@ -27,26 +27,26 @@ public class RenderArrow extends Render float var18 = (float)(5 + var11 * 10) / 32.0F; float var19 = (float)(10 + var11 * 10) / 32.0F; float var20 = 0.05625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); float var21 = (float)par1EntityArrow.arrowShake - par9; if (var21 > 0.0F) { float var22 = -MathHelper.sin(var21 * 3.0F) * var21; - GL11.glRotatef(var22, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var22, 0.0F, 0.0F, 1.0F); } - GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(var20, var20, var20); - GL11.glTranslatef(-4.0F, 0.0F, 0.0F); - GL11.glNormal3f(var20, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glScalef(var20, var20, var20); + EaglerAdapter.glTranslatef(-4.0F, 0.0F, 0.0F); + EaglerAdapter.glNormal3f(var20, 0.0F, 0.0F); var10.startDrawingQuads(); var10.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double)var16, (double)var18); var10.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double)var17, (double)var18); var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)var17, (double)var19); var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)var16, (double)var19); var10.draw(); - GL11.glNormal3f(-var20, 0.0F, 0.0F); + EaglerAdapter.glNormal3f(-var20, 0.0F, 0.0F); var10.startDrawingQuads(); var10.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double)var16, (double)var18); var10.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double)var17, (double)var18); @@ -56,8 +56,8 @@ public class RenderArrow extends Render for (int var23 = 0; var23 < 4; ++var23) { - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glNormal3f(0.0F, 0.0F, var20); + EaglerAdapter.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glNormal3f(0.0F, 0.0F, var20); var10.startDrawingQuads(); var10.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double)var12, (double)var14); var10.addVertexWithUV(8.0D, -2.0D, 0.0D, (double)var13, (double)var14); @@ -66,8 +66,8 @@ public class RenderArrow extends Render var10.draw(); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getArrowTextures(EntityArrow par1EntityArrow) diff --git a/src/main/java/net/minecraft/src/RenderBat.java b/src/main/java/net/minecraft/src/RenderBat.java index 0b10972..7ad554e 100644 --- a/src/main/java/net/minecraft/src/RenderBat.java +++ b/src/main/java/net/minecraft/src/RenderBat.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderBat extends RenderLiving { @@ -39,7 +39,7 @@ public class RenderBat extends RenderLiving protected void func_82442_a(EntityBat par1EntityBat, float par2) { - GL11.glScalef(0.35F, 0.35F, 0.35F); + EaglerAdapter.glScalef(0.35F, 0.35F, 0.35F); } protected void func_82445_a(EntityBat par1EntityBat, double par2, double par4, double par6) @@ -51,11 +51,11 @@ public class RenderBat extends RenderLiving { if (!par1EntityBat.getIsBatHanging()) { - GL11.glTranslatef(0.0F, MathHelper.cos(par2 * 0.3F) * 0.1F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, MathHelper.cos(par2 * 0.3F) * 0.1F, 0.0F); } else { - GL11.glTranslatef(0.0F, -0.1F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -0.1F, 0.0F); } super.rotateCorpse(par1EntityBat, par2, par3, par4); diff --git a/src/main/java/net/minecraft/src/RenderBiped.java b/src/main/java/net/minecraft/src/RenderBiped.java index d9e015a..34a75cc 100644 --- a/src/main/java/net/minecraft/src/RenderBiped.java +++ b/src/main/java/net/minecraft/src/RenderBiped.java @@ -4,7 +4,7 @@ import com.google.common.collect.Maps; import java.util.Map; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderBiped extends RenderLiving { @@ -87,7 +87,7 @@ public class RenderBiped extends RenderLiving float var10 = (float)(var9 >> 16 & 255) / 255.0F; float var11 = (float)(var9 >> 8 & 255) / 255.0F; float var12 = (float)(var9 & 255) / 255.0F; - GL11.glColor3f(var8 * var10, var8 * var11, var8 * var12); + EaglerAdapter.glColor3f(var8 * var10, var8 * var11, var8 * var12); if (var4.isItemEnchanted()) { @@ -97,7 +97,7 @@ public class RenderBiped extends RenderLiving return 16; } - GL11.glColor3f(var8, var8, var8); + EaglerAdapter.glColor3f(var8, var8, var8); if (var4.isItemEnchanted()) { @@ -123,7 +123,7 @@ public class RenderBiped extends RenderLiving { this.bindTexture(func_110858_a((ItemArmor)var5, par2, "overlay")); float var6 = 1.0F; - GL11.glColor3f(var6, var6, var6); + EaglerAdapter.glColor3f(var6, var6, var6); } } } @@ -131,7 +131,7 @@ public class RenderBiped extends RenderLiving public void doRenderLiving(EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) { float var10 = 1.0F; - GL11.glColor3f(var10, var10, var10); + EaglerAdapter.glColor3f(var10, var10, var10); ItemStack var11 = par1EntityLiving.getHeldItem(); this.func_82420_a(par1EntityLiving, var11); double var12 = par4 - (double)par1EntityLiving.yOffset; @@ -161,7 +161,7 @@ public class RenderBiped extends RenderLiving protected void func_130005_c(EntityLiving par1EntityLiving, float par2) { float var3 = 1.0F; - GL11.glColor3f(var3, var3, var3); + EaglerAdapter.glColor3f(var3, var3, var3); super.renderEquippedItems(par1EntityLiving, par2); ItemStack var4 = par1EntityLiving.getHeldItem(); ItemStack var5 = par1EntityLiving.func_130225_q(3); @@ -169,7 +169,7 @@ public class RenderBiped extends RenderLiving if (var5 != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.modelBipedMain.bipedHead.postRender(0.0625F); if (var5.getItem().itemID < 256) @@ -177,9 +177,9 @@ public class RenderBiped extends RenderLiving if (RenderBlocks.renderItemIn3d(Block.blocksList[var5.itemID].getRenderType())) { var6 = 0.625F; - GL11.glTranslatef(0.0F, -0.25F, 0.0F); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(var6, -var6, -var6); + EaglerAdapter.glTranslatef(0.0F, -0.25F, 0.0F); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var6, -var6, -var6); } this.renderManager.itemRenderer.renderItem(par1EntityLiving, var5, 0); @@ -187,7 +187,7 @@ public class RenderBiped extends RenderLiving else if (var5.getItem().itemID == Item.skull.itemID) { var6 = 1.0625F; - GL11.glScalef(var6, -var6, -var6); + EaglerAdapter.glScalef(var6, -var6, -var6); String var7 = ""; if (var5.hasTagCompound() && var5.getTagCompound().hasKey("SkullOwner")) @@ -198,41 +198,41 @@ public class RenderBiped extends RenderLiving TileEntitySkullRenderer.skullRenderer.func_82393_a(-0.5F, 0.0F, -0.5F, 1, 180.0F, var5.getItemDamage(), var7); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } if (var4 != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); if (this.mainModel.isChild) { var6 = 0.5F; - GL11.glTranslatef(0.0F, 0.625F, 0.0F); - GL11.glRotatef(-20.0F, -1.0F, 0.0F, 0.0F); - GL11.glScalef(var6, var6, var6); + EaglerAdapter.glTranslatef(0.0F, 0.625F, 0.0F); + EaglerAdapter.glRotatef(-20.0F, -1.0F, 0.0F, 0.0F); + EaglerAdapter.glScalef(var6, var6, var6); } this.modelBipedMain.bipedRightArm.postRender(0.0625F); - GL11.glTranslatef(-0.0625F, 0.4375F, 0.0625F); + EaglerAdapter.glTranslatef(-0.0625F, 0.4375F, 0.0625F); if (var4.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var4.itemID].getRenderType())) { var6 = 0.5F; - GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); + EaglerAdapter.glTranslatef(0.0F, 0.1875F, -0.3125F); var6 *= 0.75F; - GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(-var6, -var6, var6); + EaglerAdapter.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(-var6, -var6, var6); } else if (var4.itemID == Item.bow.itemID) { var6 = 0.625F; - GL11.glTranslatef(0.0F, 0.125F, 0.3125F); - GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(var6, -var6, var6); - GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.125F, 0.3125F); + EaglerAdapter.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var6, -var6, var6); + EaglerAdapter.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } else if (Item.itemsList[var4.itemID].isFull3D()) { @@ -240,23 +240,23 @@ public class RenderBiped extends RenderLiving if (Item.itemsList[var4.itemID].shouldRotateAroundWhenRendering()) { - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -0.125F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, -0.125F, 0.0F); } this.func_82422_c(); - GL11.glScalef(var6, -var6, var6); - GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var6, -var6, var6); + EaglerAdapter.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } else { var6 = 0.375F; - GL11.glTranslatef(0.25F, 0.1875F, -0.1875F); - GL11.glScalef(var6, var6, var6); - GL11.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.25F, 0.1875F, -0.1875F); + EaglerAdapter.glScalef(var6, var6, var6); + EaglerAdapter.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); } this.renderManager.itemRenderer.renderItem(par1EntityLiving, var4, 0); @@ -266,13 +266,13 @@ public class RenderBiped extends RenderLiving this.renderManager.itemRenderer.renderItem(par1EntityLiving, var4, 1); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } protected void func_82422_c() { - GL11.glTranslatef(0.0F, 0.1875F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.1875F, 0.0F); } protected void func_82439_b(EntityLivingBase par1EntityLivingBase, int par2, float par3) diff --git a/src/main/java/net/minecraft/src/RenderBlocks.java b/src/main/java/net/minecraft/src/RenderBlocks.java index 72d9d3f..0e56c77 100644 --- a/src/main/java/net/minecraft/src/RenderBlocks.java +++ b/src/main/java/net/minecraft/src/RenderBlocks.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderBlocks @@ -7593,7 +7593,7 @@ public class RenderBlocks var7 = (float)(var6 >> 16 & 255) / 255.0F; var8 = (float)(var6 >> 8 & 255) / 255.0F; var9 = (float)(var6 & 255) / 255.0F; - GL11.glColor4f(var7 * par3, var8 * par3, var9 * par3, 1.0F); + EaglerAdapter.glColor4f(var7 * par3, var8 * par3, var9 * par3, 1.0F); } var6 = par1Block.getRenderType(); @@ -7627,7 +7627,7 @@ public class RenderBlocks else if (var6 == 13) { par1Block.setBlockBoundsForItemRender(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var7 = 0.0625F; var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); @@ -7661,14 +7661,14 @@ public class RenderBlocks this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 5)); var4.addTranslation(var7, 0.0F, 0.0F); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } else if (var6 == 22) { - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); } else if (var6 == 6) { @@ -7698,7 +7698,7 @@ public class RenderBlocks this.setRenderBounds(0.0D, 0.0D, 0.5D, 1.0D, 0.5D, 1.0D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 0)); @@ -7723,13 +7723,13 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 5)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } } else if (var6 == 27) { var14 = 0; - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); for (int var15 = 0; var15 < 8; ++var15) @@ -7801,7 +7801,7 @@ public class RenderBlocks } var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); } else if (var6 == 11) @@ -7832,7 +7832,7 @@ public class RenderBlocks this.setRenderBounds((double)(0.5F - var8), (double)(0.5F - var8 * 3.0F), (double)(-var8 * 2.0F), (double)(0.5F + var8), (double)(0.5F - var8), (double)(1.0F + var8 * 2.0F)); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 0)); @@ -7857,7 +7857,7 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 5)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); @@ -7885,7 +7885,7 @@ public class RenderBlocks this.setRenderBounds((double)(0.5F - var8), 0.5D, 0.0D, (double)(0.5F + var8), (double)(1.0F - var8), 1.0D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 0)); @@ -7910,7 +7910,7 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSide(par1Block, 5)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } } else if (var6 == 32) @@ -7927,7 +7927,7 @@ public class RenderBlocks this.setRenderBounds(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 0, par2)); @@ -7952,16 +7952,16 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 5, par2)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); } else if (var6 == 35) { - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); this.renderBlockAnvilOrient((BlockAnvil)par1Block, 0, 0, 0, par2 << 2, true); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } else if (var6 == 34) { @@ -7983,7 +7983,7 @@ public class RenderBlocks this.setOverrideBlockTexture(this.getBlockIcon(Block.glass)); } - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 0, par2)); @@ -8008,7 +8008,7 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 5, par2)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } this.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); @@ -8016,9 +8016,9 @@ public class RenderBlocks } else if (var6 == 38) { - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); this.renderBlockHopperMetadata((BlockHopper)par1Block, 0, 0, 0, 0, true); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } } else @@ -8030,8 +8030,8 @@ public class RenderBlocks par1Block.setBlockBoundsForItemRender(); this.setRenderBoundsFromBlock(par1Block); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); var4.startDrawingQuads(); var4.setNormal(0.0F, -1.0F, 0.0F); this.renderFaceYNeg(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 0, par2)); @@ -8043,7 +8043,7 @@ public class RenderBlocks var8 = (float)(var14 >> 16 & 255) / 255.0F; var9 = (float)(var14 >> 8 & 255) / 255.0F; float var10 = (float)(var14 & 255) / 255.0F; - GL11.glColor4f(var8 * par3, var9 * par3, var10 * par3, 1.0F); + EaglerAdapter.glColor4f(var8 * par3, var9 * par3, var10 * par3, 1.0F); } var4.startDrawingQuads(); @@ -8053,7 +8053,7 @@ public class RenderBlocks if (var5 && this.useInventoryTint) { - GL11.glColor4f(par3, par3, par3, 1.0F); + EaglerAdapter.glColor4f(par3, par3, par3, 1.0F); } var4.startDrawingQuads(); @@ -8072,7 +8072,7 @@ public class RenderBlocks var4.setNormal(1.0F, 0.0F, 0.0F); this.renderFaceXPos(par1Block, 0.0D, 0.0D, 0.0D, this.getBlockIconFromSideAndMetadata(par1Block, 5, par2)); var4.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); } } diff --git a/src/main/java/net/minecraft/src/RenderBoat.java b/src/main/java/net/minecraft/src/RenderBoat.java index 5894e15..1e67f8c 100644 --- a/src/main/java/net/minecraft/src/RenderBoat.java +++ b/src/main/java/net/minecraft/src/RenderBoat.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderBoat extends Render { @@ -21,9 +21,9 @@ public class RenderBoat extends Render */ public void renderBoat(EntityBoat par1EntityBoat, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); float var10 = (float)par1EntityBoat.getTimeSinceHit() - par9; float var11 = par1EntityBoat.getDamageTaken() - par9; @@ -34,16 +34,16 @@ public class RenderBoat extends Render if (var10 > 0.0F) { - GL11.glRotatef(MathHelper.sin(var10) * var10 * var11 / 10.0F * (float)par1EntityBoat.getForwardDirection(), 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(MathHelper.sin(var10) * var10 * var11 / 10.0F * (float)par1EntityBoat.getForwardDirection(), 1.0F, 0.0F, 0.0F); } float var12 = 0.75F; - GL11.glScalef(var12, var12, var12); - GL11.glScalef(1.0F / var12, 1.0F / var12, 1.0F / var12); + EaglerAdapter.glScalef(var12, var12, var12); + EaglerAdapter.glScalef(1.0F / var12, 1.0F / var12, 1.0F / var12); this.bindEntityTexture(par1EntityBoat); - GL11.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); this.modelBoat.render(par1EntityBoat, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getBoatTextures(EntityBoat par1EntityBoat) diff --git a/src/main/java/net/minecraft/src/RenderCaveSpider.java b/src/main/java/net/minecraft/src/RenderCaveSpider.java index 93181c9..b1f62fb 100644 --- a/src/main/java/net/minecraft/src/RenderCaveSpider.java +++ b/src/main/java/net/minecraft/src/RenderCaveSpider.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderCaveSpider extends RenderSpider { @@ -14,7 +14,7 @@ public class RenderCaveSpider extends RenderSpider protected void scaleSpider(EntityCaveSpider par1EntityCaveSpider, float par2) { - GL11.glScalef(0.7F, 0.7F, 0.7F); + EaglerAdapter.glScalef(0.7F, 0.7F, 0.7F); } protected TextureLocation getCaveSpiderTextures(EntityCaveSpider par1EntityCaveSpider) diff --git a/src/main/java/net/minecraft/src/RenderCreeper.java b/src/main/java/net/minecraft/src/RenderCreeper.java index 5ba46ae..6de5ebe 100644 --- a/src/main/java/net/minecraft/src/RenderCreeper.java +++ b/src/main/java/net/minecraft/src/RenderCreeper.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderCreeper extends RenderLiving { @@ -38,7 +38,7 @@ public class RenderCreeper extends RenderLiving var3 *= var3; float var5 = (1.0F + var3 * 0.4F) * var4; float var6 = (1.0F + var3 * 0.1F) / var4; - GL11.glScalef(var5, var6, var5); + EaglerAdapter.glScalef(var5, var6, var5); } /** @@ -82,39 +82,39 @@ public class RenderCreeper extends RenderLiving { if (par1EntityCreeper.isInvisible()) { - GL11.glDepthMask(false); + EaglerAdapter.glDepthMask(false); } else { - GL11.glDepthMask(true); + EaglerAdapter.glDepthMask(true); } if (par2 == 1) { float var4 = (float)par1EntityCreeper.ticksExisted + par3; this.bindTexture(armoredCreeperTextures); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glLoadIdentity(); float var5 = var4 * 0.01F; float var6 = var4 * 0.01F; - GL11.glTranslatef(var5, var6, 0.0F); + EaglerAdapter.glTranslatef(var5, var6, 0.0F); this.setRenderPassModel(this.creeperModel); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); float var7 = 0.5F; - GL11.glColor4f(var7, var7, var7, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + EaglerAdapter.glColor4f(var7, var7, var7, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); return 1; } if (par2 == 2) { - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } } diff --git a/src/main/java/net/minecraft/src/RenderDragon.java b/src/main/java/net/minecraft/src/RenderDragon.java index 6eb698d..bfc88d6 100644 --- a/src/main/java/net/minecraft/src/RenderDragon.java +++ b/src/main/java/net/minecraft/src/RenderDragon.java @@ -3,7 +3,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.adapter.Tessellator; public class RenderDragon extends RenderLiving @@ -30,9 +30,9 @@ public class RenderDragon extends RenderLiving { float var5 = (float)par1EntityDragon.getMovementOffsets(7, par4)[0]; float var6 = (float)(par1EntityDragon.getMovementOffsets(5, par4)[1] - par1EntityDragon.getMovementOffsets(10, par4)[1]); - GL11.glRotatef(-var5, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var6 * 10.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-var5, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var6 * 10.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.0F, 1.0F); if (par1EntityDragon.deathTime > 0) { @@ -44,7 +44,7 @@ public class RenderDragon extends RenderLiving var7 = 1.0F; } - GL11.glRotatef(var7 * this.getDeathMaxRotation(par1EntityDragon), 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var7 * this.getDeathMaxRotation(par1EntityDragon), 0.0F, 0.0F, 1.0F); } } @@ -56,13 +56,13 @@ public class RenderDragon extends RenderLiving if (par1EntityDragon.deathTicks > 0) { float var8 = (float)par1EntityDragon.deathTicks / 200.0F; - GL11.glDepthFunc(GL11.GL_LEQUAL); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glAlphaFunc(GL11.GL_GREATER, var8); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, var8); this.bindTexture(enderDragonExplodingTextures); this.mainModel.render(par1EntityDragon, par2, par3, par4, par5, par6, par7); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - GL11.glDepthFunc(GL11.GL_EQUAL); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.1F); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); } this.bindEntityTexture(par1EntityDragon); @@ -70,15 +70,15 @@ public class RenderDragon extends RenderLiving if (par1EntityDragon.hurtTime > 0) { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0F, 0.0F, 0.0F, 0.5F); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glColor4f(1.0F, 0.0F, 0.0F, 0.5F); this.mainModel.render(par1EntityDragon, par2, par3, par4, par5, par6, par7); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } } @@ -100,15 +100,15 @@ public class RenderDragon extends RenderLiving float var14 = (float)(par1EntityDragon.healingEnderCrystal.posZ - par1EntityDragon.posZ - (par1EntityDragon.prevPosZ - par1EntityDragon.posZ) * (double)(1.0F - par9)); float var15 = MathHelper.sqrt_float(var12 * var12 + var14 * var14); float var16 = MathHelper.sqrt_float(var12 * var12 + var13 * var13 + var14 * var14); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4 + 2.0F, (float)par6); - GL11.glRotatef((float)(-Math.atan2((double)var14, (double)var12)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef((float)(-Math.atan2((double)var15, (double)var13)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4 + 2.0F, (float)par6); + EaglerAdapter.glRotatef((float)(-Math.atan2((double)var14, (double)var12)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef((float)(-Math.atan2((double)var15, (double)var13)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); Tessellator var17 = Tessellator.instance; RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); this.bindTexture(enderDragonCrystalBeamTextures); - GL11.glShadeModel(GL11.GL_SMOOTH); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); float var18 = 0.0F - ((float)par1EntityDragon.ticksExisted + par9) * 0.01F; float var19 = MathHelper.sqrt_float(var12 * var12 + var13 * var13 + var14 * var14) / 32.0F - ((float)par1EntityDragon.ticksExisted + par9) * 0.01F; var17.startDrawing(5); @@ -126,10 +126,10 @@ public class RenderDragon extends RenderLiving } var17.draw(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_FLAT); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); RenderHelper.enableStandardItemLighting(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } @@ -158,24 +158,24 @@ public class RenderDragon extends RenderLiving } EaglercraftRandom var6 = new EaglercraftRandom(432L); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, -1.0F, -2.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef(0.0F, -1.0F, -2.0F); for (int var7 = 0; (float)var7 < (var4 + var4 * var4) / 2.0F * 60.0F; ++var7) { - GL11.glRotatef(var6.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(var6.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var6.nextFloat() * 360.0F + var4 * 90.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var6.nextFloat() * 360.0F + var4 * 90.0F, 0.0F, 0.0F, 1.0F); var3.startDrawing(6); float var8 = var6.nextFloat() * 20.0F + 5.0F + var5 * 10.0F; float var9 = var6.nextFloat() * 2.0F + 1.0F + var5 * 2.0F; @@ -189,14 +189,14 @@ public class RenderDragon extends RenderLiving var3.draw(); } - GL11.glPopMatrix(); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); RenderHelper.enableStandardItemLighting(); } } @@ -208,7 +208,7 @@ public class RenderDragon extends RenderLiving { if (par2 == 1) { - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } if (par2 != 0) @@ -219,18 +219,18 @@ public class RenderDragon extends RenderLiving { this.bindTexture(enderDragonEyesTextures); float var4 = 1.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_EQUAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); char var5 = 61680; int var6 = var5 % 65536; int var7 = var5 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var6 / 1.0F, (float)var7 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glColor4f(1.0F, 1.0F, 1.0F, var4); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, var4); return 1; } } diff --git a/src/main/java/net/minecraft/src/RenderEnchantmentTable.java b/src/main/java/net/minecraft/src/RenderEnchantmentTable.java index d196705..7bf4f87 100644 --- a/src/main/java/net/minecraft/src/RenderEnchantmentTable.java +++ b/src/main/java/net/minecraft/src/RenderEnchantmentTable.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderEnchantmentTable extends TileEntitySpecialRenderer { @@ -10,10 +10,10 @@ public class RenderEnchantmentTable extends TileEntitySpecialRenderer public void renderTileEntityEnchantmentTableAt(TileEntityEnchantmentTable par1TileEntityEnchantmentTable, double par2, double par4, double par6, float par8) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F, (float)par6 + 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F, (float)par6 + 0.5F); float var9 = (float)par1TileEntityEnchantmentTable.tickCount + par8; - GL11.glTranslatef(0.0F, 0.1F + MathHelper.sin(var9 * 0.1F) * 0.01F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.1F + MathHelper.sin(var9 * 0.1F) * 0.01F, 0.0F); float var10; for (var10 = par1TileEntityEnchantmentTable.bookRotation2 - par1TileEntityEnchantmentTable.bookRotationPrev; var10 >= (float)Math.PI; var10 -= ((float)Math.PI * 2F)) @@ -27,8 +27,8 @@ public class RenderEnchantmentTable extends TileEntitySpecialRenderer } float var11 = par1TileEntityEnchantmentTable.bookRotationPrev + var10 * par8; - GL11.glRotatef(-var11 * 180.0F / (float)Math.PI, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(80.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-var11 * 180.0F / (float)Math.PI, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(80.0F, 0.0F, 0.0F, 1.0F); this.bindTexture(enchantingTableBookTextures); float var12 = par1TileEntityEnchantmentTable.pageFlipPrev + (par1TileEntityEnchantmentTable.pageFlip - par1TileEntityEnchantmentTable.pageFlipPrev) * par8 + 0.25F; float var13 = par1TileEntityEnchantmentTable.pageFlipPrev + (par1TileEntityEnchantmentTable.pageFlip - par1TileEntityEnchantmentTable.pageFlipPrev) * par8 + 0.75F; @@ -56,9 +56,9 @@ public class RenderEnchantmentTable extends TileEntitySpecialRenderer } float var14 = par1TileEntityEnchantmentTable.bookSpreadPrev + (par1TileEntityEnchantmentTable.bookSpread - par1TileEntityEnchantmentTable.bookSpreadPrev) * par8; - GL11.glEnable(GL11.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); this.enchantmentBook.render((Entity)null, var9, var12, var13, var14, 0.0F, 0.0625F); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) diff --git a/src/main/java/net/minecraft/src/RenderEndPortal.java b/src/main/java/net/minecraft/src/RenderEndPortal.java index 5263e0e..7fc4508 100644 --- a/src/main/java/net/minecraft/src/RenderEndPortal.java +++ b/src/main/java/net/minecraft/src/RenderEndPortal.java @@ -5,7 +5,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderEndPortal extends TileEntitySpecialRenderer { @@ -22,13 +22,13 @@ public class RenderEndPortal extends TileEntitySpecialRenderer float var9 = (float)this.tileEntityRenderer.playerX; float var10 = (float)this.tileEntityRenderer.playerY; float var11 = (float)this.tileEntityRenderer.playerZ; - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); field_110644_e.setSeed(31100L); float var12 = 0.75F; for (int var13 = 0; var13 < 16; ++var13) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var14 = (float)(16 - var13); float var15 = 0.0625F; float var16 = 1.0F / (var14 + 1.0F); @@ -39,15 +39,15 @@ public class RenderEndPortal extends TileEntitySpecialRenderer var16 = 0.1F; var14 = 65.0F; var15 = 0.125F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); } if (var13 == 1) { this.bindTexture(endPortalTextures); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); var15 = 0.5F; } @@ -56,31 +56,31 @@ public class RenderEndPortal extends TileEntitySpecialRenderer float var19 = var17 + var14 + ActiveRenderInfo.objectY; float var20 = var18 / var19; var20 += (float)(par4 + (double)var12); - GL11.glTranslatef(var9, var20, var11); - GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_R, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_Q, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_EYE_LINEAR); - GL11.glTexGen(GL11.GL_S, GL11.GL_OBJECT_PLANE, this.func_76907_a(1.0F, 0.0F, 0.0F, 0.0F)); - GL11.glTexGen(GL11.GL_T, GL11.GL_OBJECT_PLANE, this.func_76907_a(0.0F, 0.0F, 1.0F, 0.0F)); - GL11.glTexGen(GL11.GL_R, GL11.GL_OBJECT_PLANE, this.func_76907_a(0.0F, 0.0F, 0.0F, 1.0F)); - GL11.glTexGen(GL11.GL_Q, GL11.GL_EYE_PLANE, this.func_76907_a(0.0F, 1.0F, 0.0F, 0.0F)); - GL11.glEnable(GL11.GL_TEXTURE_GEN_S); - GL11.glEnable(GL11.GL_TEXTURE_GEN_T); - GL11.glEnable(GL11.GL_TEXTURE_GEN_R); - GL11.glEnable(GL11.GL_TEXTURE_GEN_Q); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); - GL11.glScalef(var15, var15, var15); - GL11.glTranslatef(0.5F, 0.5F, 0.0F); - GL11.glRotatef((float)(var13 * var13 * 4321 + var13 * 9) * 2.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, -0.5F, 0.0F); - GL11.glTranslatef(-var9, -var11, -var10); + EaglerAdapter.glTranslatef(var9, var20, var11); + EaglerAdapter.glTexGeni(EaglerAdapter.GL_S, EaglerAdapter.GL_TEXTURE_GEN_MODE, EaglerAdapter.GL_OBJECT_LINEAR); + EaglerAdapter.glTexGeni(EaglerAdapter.GL_T, EaglerAdapter.GL_TEXTURE_GEN_MODE, EaglerAdapter.GL_OBJECT_LINEAR); + EaglerAdapter.glTexGeni(EaglerAdapter.GL_R, EaglerAdapter.GL_TEXTURE_GEN_MODE, EaglerAdapter.GL_OBJECT_LINEAR); + EaglerAdapter.glTexGeni(EaglerAdapter.GL_Q, EaglerAdapter.GL_TEXTURE_GEN_MODE, EaglerAdapter.GL_EYE_LINEAR); + EaglerAdapter.glTexGen(EaglerAdapter.GL_S, EaglerAdapter.GL_OBJECT_PLANE, this.func_76907_a(1.0F, 0.0F, 0.0F, 0.0F)); + EaglerAdapter.glTexGen(EaglerAdapter.GL_T, EaglerAdapter.GL_OBJECT_PLANE, this.func_76907_a(0.0F, 0.0F, 1.0F, 0.0F)); + EaglerAdapter.glTexGen(EaglerAdapter.GL_R, EaglerAdapter.GL_OBJECT_PLANE, this.func_76907_a(0.0F, 0.0F, 0.0F, 1.0F)); + EaglerAdapter.glTexGen(EaglerAdapter.GL_Q, EaglerAdapter.GL_EYE_PLANE, this.func_76907_a(0.0F, 1.0F, 0.0F, 0.0F)); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_GEN_S); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_GEN_T); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_GEN_R); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_GEN_Q); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glTranslatef(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); + EaglerAdapter.glScalef(var15, var15, var15); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.0F); + EaglerAdapter.glRotatef((float)(var13 * var13 * 4321 + var13 * 9) * 2.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, 0.0F); + EaglerAdapter.glTranslatef(-var9, -var11, -var10); var18 = var17 + ActiveRenderInfo.objectY; - GL11.glTranslatef(ActiveRenderInfo.objectX * var14 / var18, ActiveRenderInfo.objectZ * var14 / var18, -var10); + EaglerAdapter.glTranslatef(ActiveRenderInfo.objectX * var14 / var18, ActiveRenderInfo.objectZ * var14 / var18, -var10); Tessellator var23 = Tessellator.instance; var23.startDrawingQuads(); var20 = field_110644_e.nextFloat() * 0.5F + 0.1F; @@ -100,16 +100,16 @@ public class RenderEndPortal extends TileEntitySpecialRenderer var23.addVertex(par2 + 1.0D, par4 + (double)var12, par6 + 1.0D); var23.addVertex(par2 + 1.0D, par4 + (double)var12, par6); var23.draw(); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); } - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_TEXTURE_GEN_S); - GL11.glDisable(GL11.GL_TEXTURE_GEN_T); - GL11.glDisable(GL11.GL_TEXTURE_GEN_R); - GL11.glDisable(GL11.GL_TEXTURE_GEN_Q); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_GEN_S); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_GEN_T); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_GEN_R); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_GEN_Q); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } private FloatBuffer func_76907_a(float par1, float par2, float par3, float par4) diff --git a/src/main/java/net/minecraft/src/RenderEnderCrystal.java b/src/main/java/net/minecraft/src/RenderEnderCrystal.java index 6f56cca..3ab0736 100644 --- a/src/main/java/net/minecraft/src/RenderEnderCrystal.java +++ b/src/main/java/net/minecraft/src/RenderEnderCrystal.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderEnderCrystal extends Render { @@ -20,13 +20,13 @@ public class RenderEnderCrystal extends Render public void doRenderEnderCrystal(EntityEnderCrystal par1EntityEnderCrystal, double par2, double par4, double par6, float par8, float par9) { float var10 = (float)par1EntityEnderCrystal.innerRotation + par9; - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); this.bindTexture(enderCrystalTextures); float var11 = MathHelper.sin(var10 * 0.2F) / 2.0F + 0.5F; var11 += var11 * var11; this.field_76995_b.render(par1EntityEnderCrystal, 0.0F, var10 * 3.0F, var11 * 0.2F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getEnderCrystalTextures(EntityEnderCrystal par1EntityEnderCrystal) diff --git a/src/main/java/net/minecraft/src/RenderEnderman.java b/src/main/java/net/minecraft/src/RenderEnderman.java index a3ad9f7..4abeffd 100644 --- a/src/main/java/net/minecraft/src/RenderEnderman.java +++ b/src/main/java/net/minecraft/src/RenderEnderman.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglercraftRandom; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; import net.lax1dude.eaglercraft.TextureLocation; @@ -55,24 +55,24 @@ public class RenderEnderman extends RenderLiving if (par1EntityEnderman.getCarried() > 0) { - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPushMatrix(); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPushMatrix(); float var3 = 0.5F; - GL11.glTranslatef(0.0F, 0.6875F, -0.75F); + EaglerAdapter.glTranslatef(0.0F, 0.6875F, -0.75F); var3 *= 1.0F; - GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(-var3, -var3, var3); + EaglerAdapter.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(-var3, -var3, var3); int var4 = par1EntityEnderman.getBrightnessForRender(par2); int var5 = var4 % 65536; int var6 = var4 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var5 / 1.0F, (float)var6 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.bindTexture(TextureMap.locationBlocksTexture); this.renderBlocks.renderBlockAsItem(Block.blocksList[par1EntityEnderman.getCarried()], par1EntityEnderman.getCarryingData(), 1.0F); - GL11.glPopMatrix(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } } @@ -90,27 +90,27 @@ public class RenderEnderman extends RenderLiving { this.bindTexture(endermanEyesTexture); float var4 = 1.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); if (par1EntityEnderman.isInvisible()) { - GL11.glDepthMask(false); + EaglerAdapter.glDepthMask(false); } else { - GL11.glDepthMask(true); + EaglerAdapter.glDepthMask(true); } char var5 = 61680; int var6 = var5 % 65536; int var7 = var5 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var6 / 1.0F, (float)var7 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glColor4f(1.0F, 1.0F, 1.0F, var4); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, var4); return 1; } } diff --git a/src/main/java/net/minecraft/src/RenderEntity.java b/src/main/java/net/minecraft/src/RenderEntity.java index 070784b..d7d030f 100644 --- a/src/main/java/net/minecraft/src/RenderEntity.java +++ b/src/main/java/net/minecraft/src/RenderEntity.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderEntity extends Render { @@ -13,9 +13,9 @@ public class RenderEntity extends Render */ public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); renderOffsetAABB(par1Entity.boundingBox, par2 - par1Entity.lastTickPosX, par4 - par1Entity.lastTickPosY, par6 - par1Entity.lastTickPosZ); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } /** diff --git a/src/main/java/net/minecraft/src/RenderFallingSand.java b/src/main/java/net/minecraft/src/RenderFallingSand.java index 8bff6b7..a4b3117 100644 --- a/src/main/java/net/minecraft/src/RenderFallingSand.java +++ b/src/main/java/net/minecraft/src/RenderFallingSand.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderFallingSand extends Render { @@ -23,10 +23,10 @@ public class RenderFallingSand extends Render if (var10.getBlockId(MathHelper.floor_double(par1EntityFallingSand.posX), MathHelper.floor_double(par1EntityFallingSand.posY), MathHelper.floor_double(par1EntityFallingSand.posZ)) != par1EntityFallingSand.blockID) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); this.bindEntityTexture(par1EntityFallingSand); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); Tessellator var12; if (var11 instanceof BlockAnvil && var11.getRenderType() == 35) @@ -55,8 +55,8 @@ public class RenderFallingSand extends Render this.sandRenderBlocks.renderBlockSandFalling(var11, var10, MathHelper.floor_double(par1EntityFallingSand.posX), MathHelper.floor_double(par1EntityFallingSand.posY), MathHelper.floor_double(par1EntityFallingSand.posZ), par1EntityFallingSand.metadata); } - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glPopMatrix(); } } diff --git a/src/main/java/net/minecraft/src/RenderFireball.java b/src/main/java/net/minecraft/src/RenderFireball.java index 70bcefb..33ae293 100644 --- a/src/main/java/net/minecraft/src/RenderFireball.java +++ b/src/main/java/net/minecraft/src/RenderFireball.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderFireball extends Render @@ -16,12 +16,12 @@ public class RenderFireball extends Render public void doRenderFireball(EntityFireball par1EntityFireball, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.bindEntityTexture(par1EntityFireball); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); float var10 = this.field_77002_a; - GL11.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F); + EaglerAdapter.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F); Icon var11 = Item.fireballCharge.getIconFromDamage(0); Tessellator var12 = Tessellator.instance; float var13 = var11.getMinU(); @@ -31,8 +31,8 @@ public class RenderFireball extends Render float var17 = 1.0F; float var18 = 0.5F; float var19 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); var12.startDrawingQuads(); var12.setNormal(0.0F, 1.0F, 0.0F); var12.addVertexWithUV((double)(0.0F - var18), (double)(0.0F - var19), 0.0D, (double)var13, (double)var16); @@ -40,8 +40,8 @@ public class RenderFireball extends Render var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); var12.draw(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getFireballTextures(EntityFireball par1EntityFireball) diff --git a/src/main/java/net/minecraft/src/RenderFish.java b/src/main/java/net/minecraft/src/RenderFish.java index 88ca511..66ba0bc 100644 --- a/src/main/java/net/minecraft/src/RenderFish.java +++ b/src/main/java/net/minecraft/src/RenderFish.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderFish extends Render @@ -14,10 +14,10 @@ public class RenderFish extends Render */ public void doRenderFishHook(EntityFishHook par1EntityFishHook, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); this.bindEntityTexture(par1EntityFishHook); Tessellator var10 = Tessellator.instance; byte var11 = 1; @@ -29,8 +29,8 @@ public class RenderFish extends Render float var17 = 1.0F; float var18 = 0.5F; float var19 = 0.5F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); var10.startDrawingQuads(); var10.setNormal(0.0F, 1.0F, 0.0F); var10.addVertexWithUV((double)(0.0F - var18), (double)(0.0F - var19), 0.0D, (double)var13, (double)var16); @@ -38,8 +38,8 @@ public class RenderFish extends Render var10.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); var10.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); var10.draw(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); if (par1EntityFishHook.angler != null) { @@ -71,8 +71,8 @@ public class RenderFish extends Render double var37 = (double)((float)(var23 - var46)); double var39 = (double)((float)(var25 - var33)); double var41 = (double)((float)(var27 - var35)); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); var10.startDrawing(3); var10.setColorOpaque_I(0); byte var43 = 16; @@ -84,8 +84,8 @@ public class RenderFish extends Render } var10.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } } diff --git a/src/main/java/net/minecraft/src/RenderGhast.java b/src/main/java/net/minecraft/src/RenderGhast.java index ffd2a6e..3bfee81 100644 --- a/src/main/java/net/minecraft/src/RenderGhast.java +++ b/src/main/java/net/minecraft/src/RenderGhast.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderGhast extends RenderLiving { @@ -33,8 +33,8 @@ public class RenderGhast extends RenderLiving var4 = 1.0F / (var4 * var4 * var4 * var4 * var4 * 2.0F + 1.0F); float var5 = (8.0F + var4) / 2.0F; float var6 = (8.0F + 1.0F / var4) / 2.0F; - GL11.glScalef(var6, var5, var6); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glScalef(var6, var5, var6); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } @Override diff --git a/src/main/java/net/minecraft/src/RenderGiantZombie.java b/src/main/java/net/minecraft/src/RenderGiantZombie.java index de66c9c..e251385 100644 --- a/src/main/java/net/minecraft/src/RenderGiantZombie.java +++ b/src/main/java/net/minecraft/src/RenderGiantZombie.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderGiantZombie extends RenderLiving { @@ -21,7 +21,7 @@ public class RenderGiantZombie extends RenderLiving */ protected void preRenderScale(EntityGiantZombie par1EntityGiantZombie, float par2) { - GL11.glScalef(this.scale, this.scale, this.scale); + EaglerAdapter.glScalef(this.scale, this.scale, this.scale); } protected TextureLocation getZombieTextures(EntityGiantZombie par1EntityGiantZombie) diff --git a/src/main/java/net/minecraft/src/RenderHorse.java b/src/main/java/net/minecraft/src/RenderHorse.java index ebfd5d7..65474dd 100644 --- a/src/main/java/net/minecraft/src/RenderHorse.java +++ b/src/main/java/net/minecraft/src/RenderHorse.java @@ -4,7 +4,7 @@ import com.google.common.collect.Maps; import java.util.Map; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderHorse extends RenderLiving { @@ -34,7 +34,7 @@ public class RenderHorse extends RenderLiving var3 *= 0.92F; } - GL11.glScalef(var3, var3, var3); + EaglerAdapter.glScalef(var3, var3, var3); super.preRenderCallback(par1EntityHorse, par2); } diff --git a/src/main/java/net/minecraft/src/RenderIronGolem.java b/src/main/java/net/minecraft/src/RenderIronGolem.java index f288c24..6a4afaf 100644 --- a/src/main/java/net/minecraft/src/RenderIronGolem.java +++ b/src/main/java/net/minecraft/src/RenderIronGolem.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderIronGolem extends RenderLiving @@ -42,7 +42,7 @@ public class RenderIronGolem extends RenderLiving float var5 = 13.0F; float var6 = par1EntityIronGolem.limbSwing - par1EntityIronGolem.limbSwingAmount * (1.0F - par4) + 6.0F; float var7 = (Math.abs(var6 % var5 - var5 * 0.5F) - var5 * 0.25F) / (var5 * 0.25F); - GL11.glRotatef(6.5F * var7, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(6.5F * var7, 0.0F, 0.0F, 1.0F); } } @@ -55,23 +55,23 @@ public class RenderIronGolem extends RenderLiving if (par1EntityIronGolem.getHoldRoseTick() != 0) { - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPushMatrix(); - GL11.glRotatef(5.0F + 180.0F * this.ironGolemModel.ironGolemRightArm.rotateAngleX / (float)Math.PI, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(-0.6875F, 1.25F, -0.9375F); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glRotatef(5.0F + 180.0F * this.ironGolemModel.ironGolemRightArm.rotateAngleX / (float)Math.PI, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.6875F, 1.25F, -0.9375F); + EaglerAdapter.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); float var3 = 0.8F; - GL11.glScalef(var3, -var3, var3); + EaglerAdapter.glScalef(var3, -var3, var3); int var4 = par1EntityIronGolem.getBrightnessForRender(par2); int var5 = var4 % 65536; int var6 = var4 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var5 / 1.0F, (float)var6 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.bindTexture(TextureMap.locationBlocksTexture); this.renderBlocks.renderBlockAsItem(Block.plantRed, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } } diff --git a/src/main/java/net/minecraft/src/RenderItem.java b/src/main/java/net/minecraft/src/RenderItem.java index 59991c7..e7ccf28 100644 --- a/src/main/java/net/minecraft/src/RenderItem.java +++ b/src/main/java/net/minecraft/src/RenderItem.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderItem extends Render @@ -42,7 +42,7 @@ public class RenderItem extends Render if (var10.getItem() != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var11 = MathHelper.sin(((float)par1EntityItem.age + par9) / 10.0F + par1EntityItem.hoverStart) * 0.1F + 0.1F; float var12 = (((float)par1EntityItem.age + par9) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI); byte var13 = 1; @@ -67,8 +67,8 @@ public class RenderItem extends Render var13 = 5; } - GL11.glTranslatef((float)par2, (float)par4 + var11, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glTranslatef((float)par2, (float)par4 + var11, (float)par6); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); float var18; float var19; float var20; @@ -77,13 +77,13 @@ public class RenderItem extends Render if (var10.getItemSpriteNumber() == 0 && var10.itemID < Block.blocksList.length && Block.blocksList[var10.itemID] != null && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) { Block var22 = Block.blocksList[var10.itemID]; - GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var12, 0.0F, 1.0F, 0.0F); if (renderInFrame) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glTranslatef(0.0F, 0.05F, 0.0F); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(1.25F, 1.25F, 1.25F); + EaglerAdapter.glTranslatef(0.0F, 0.05F, 0.0F); + EaglerAdapter.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); } float var24 = 0.25F; @@ -94,23 +94,23 @@ public class RenderItem extends Render var24 = 0.5F; } - GL11.glScalef(var24, var24, var24); + EaglerAdapter.glScalef(var24, var24, var24); for (var26 = 0; var26 < var13; ++var26) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); if (var26 > 0) { var18 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; var19 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; var20 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.2F / var24; - GL11.glTranslatef(var18, var19, var20); + EaglerAdapter.glTranslatef(var18, var19, var20); } var18 = 1.0F; this.itemRenderBlocks.renderBlockAsItem(var22, var10.getItemDamage(), var18); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } else @@ -121,12 +121,12 @@ public class RenderItem extends Render { if (renderInFrame) { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); + EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F); } else { - GL11.glScalef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); } for (int var21 = 0; var21 <= 1; ++var21) @@ -141,7 +141,7 @@ public class RenderItem extends Render var18 = (float)(var26 >> 16 & 255) / 255.0F; var19 = (float)(var26 >> 8 & 255) / 255.0F; var20 = (float)(var26 & 255) / 255.0F; - GL11.glColor4f(var18 * var16, var19 * var16, var20 * var16, 1.0F); + EaglerAdapter.glColor4f(var18 * var16, var19 * var16, var20 * var16, 1.0F); this.renderDroppedItem(par1EntityItem, var23, var13, par9, var18 * var16, var19 * var16, var20 * var16); } else @@ -154,12 +154,12 @@ public class RenderItem extends Render { if (renderInFrame) { - GL11.glScalef(0.5128205F, 0.5128205F, 0.5128205F); - GL11.glTranslatef(0.0F, -0.05F, 0.0F); + EaglerAdapter.glScalef(0.5128205F, 0.5128205F, 0.5128205F); + EaglerAdapter.glTranslatef(0.0F, -0.05F, 0.0F); } else { - GL11.glScalef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); } Icon var14 = var10.getIconIndex(); @@ -180,8 +180,8 @@ public class RenderItem extends Render } } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } } @@ -214,15 +214,15 @@ public class RenderItem extends Render if (this.renderManager.options.fancyGraphics) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); if (renderInFrame) { - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); } else { - GL11.glRotatef((((float)par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef((((float)par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); } float var16 = 0.0625F; @@ -248,11 +248,11 @@ public class RenderItem extends Render var24 = 4; } - GL11.glTranslatef(-var14, -var15, -((var16 + var17) * (float)var24 / 2.0F)); + EaglerAdapter.glTranslatef(-var14, -var15, -((var16 + var17) * (float)var24 / 2.0F)); for (int var20 = 0; var20 < var24; ++var20) { - GL11.glTranslatef(0.0F, 0.0F, var16 + var17); + EaglerAdapter.glTranslatef(0.0F, 0.0F, var16 + var17); if (var18.getItemSpriteNumber() == 0 && Block.blocksList[var18.itemID] != null) { @@ -263,63 +263,63 @@ public class RenderItem extends Render TextureMap.locationItemsTexture.bindTexture(); } - GL11.glColor4f(par5, par6, par7, 1.0F); + EaglerAdapter.glColor4f(par5, par6, par7, 1.0F); ItemRenderer.renderItemIn2D(var8, var26, var11, var25, var12, ((Icon)par2Icon).getIconWidth(), ((Icon)par2Icon).getIconHeight(), var16); if (var18.hasEffect()) { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); RES_ITEM_GLINT.bindTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_COLOR, EaglerAdapter.GL_ONE); float var21 = 0.76F; - GL11.glColor4f(0.5F * var21, 0.25F * var21, 0.8F * var21, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); + EaglerAdapter.glColor4f(0.5F * var21, 0.25F * var21, 0.8F * var21, 1.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glPushMatrix(); float var22 = 0.125F; - GL11.glScalef(var22, var22, var22); + EaglerAdapter.glScalef(var22, var22, var22); float var23 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(var23, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(var23, 0.0F, 0.0F); + EaglerAdapter.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, var16); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(var22, var22, var22); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(var22, var22, var22); var23 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-var23, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(-var23, 0.0F, 0.0F); + EaglerAdapter.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, var16); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else { for (int var27 = 0; var27 < par3; ++var27) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); if (var27 > 0) { var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; float var28 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; float var29 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - GL11.glTranslatef(var17, var28, var29); + EaglerAdapter.glTranslatef(var17, var28, var29); } if (!renderInFrame) { - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); } - GL11.glColor4f(par5, par6, par7, 1.0F); + EaglerAdapter.glColor4f(par5, par6, par7, 1.0F); var8.startDrawingQuads(); var8.setNormal(0.0F, 1.0F, 0.0F); var8.addVertexWithUV((double)(0.0F - var14), (double)(0.0F - var15), 0.0D, (double)var25, (double)var12); @@ -327,7 +327,7 @@ public class RenderItem extends Render var8.addVertexWithUV((double)(var13 - var14), (double)(1.0F - var15), 0.0D, (double)var26, (double)var11); var8.addVertexWithUV((double)(0.0F - var14), (double)(1.0F - var15), 0.0D, (double)var25, (double)var11); var8.draw(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } } @@ -349,13 +349,13 @@ public class RenderItem extends Render { TextureMap.locationBlocksTexture.bindTexture(); Block var16 = Block.blocksList[var6]; - GL11.glPushMatrix(); - GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel); - GL11.glScalef(10.0F, 10.0F, 10.0F); - GL11.glTranslatef(1.0F, 0.5F, 1.0F); - GL11.glScalef(1.0F, 1.0F, -1.0F); - GL11.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel); + EaglerAdapter.glScalef(10.0F, 10.0F, 10.0F); + EaglerAdapter.glTranslatef(1.0F, 0.5F, 1.0F); + EaglerAdapter.glScalef(1.0F, 1.0F, -1.0F); + EaglerAdapter.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); var17 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, 0); var18 = (float)(var17 >> 16 & 255) / 255.0F; var12 = (float)(var17 >> 8 & 255) / 255.0F; @@ -363,18 +363,18 @@ public class RenderItem extends Render if (this.renderWithColor) { - GL11.glColor4f(var18, var12, var13, 1.0F); + EaglerAdapter.glColor4f(var18, var12, var13, 1.0F); } - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); this.itemRenderBlocks.useInventoryTint = this.renderWithColor; this.itemRenderBlocks.renderBlockAsItem(var16, var7, 1.0F); this.itemRenderBlocks.useInventoryTint = true; - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } else if (Item.itemsList[var6].requiresMultipleRenderPasses()) { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); TextureMap.locationItemsTexture.bindTexture(); for (int var9 = 0; var9 <= 1; ++var9) @@ -387,17 +387,17 @@ public class RenderItem extends Render if (this.renderWithColor) { - GL11.glColor4f(var12, var13, var14, 1.0F); + EaglerAdapter.glColor4f(var12, var13, var14, 1.0F); } this.renderIcon(par4, par5, var10, 16, 16); } - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } else { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); if (par3ItemStack.getItemSpriteNumber() == 0) { terrain.bindTexture(); } else { @@ -416,14 +416,14 @@ public class RenderItem extends Render if (this.renderWithColor) { - GL11.glColor4f(var18, var12, var13, 1.0F); + EaglerAdapter.glColor4f(var18, var12, var13, 1.0F); } this.renderIcon(par4, par5, (Icon)var8, 16, 16); - GL11.glEnable(GL11.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); } - GL11.glEnable(GL11.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); } /** @@ -437,20 +437,20 @@ public class RenderItem extends Render if (par3ItemStack.hasEffect()) { - GL11.glDepthFunc(GL11.GL_GREATER); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_GREATER); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthMask(false); RES_ITEM_GLINT.bindTexture(); this.zLevel -= 50.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); - GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_DST_COLOR, EaglerAdapter.GL_DST_COLOR); + EaglerAdapter.glColor4f(0.5F, 0.25F, 0.8F, 1.0F); this.renderGlint(par4 * 431278612 + par5 * 32178161, par4 - 2, par5 - 2, 20, 20); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthMask(true); this.zLevel += 50.0F; - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } } } @@ -461,12 +461,12 @@ public class RenderItem extends Render { if (var6 == 0) { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_COLOR, EaglerAdapter.GL_ONE); } if (var6 == 1) { - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_COLOR, EaglerAdapter.GL_ONE); } float var7 = 0.00390625F; @@ -506,30 +506,30 @@ public class RenderItem extends Render if (par3ItemStack.stackSize > 1 || par6Str != null) { String var7 = par6Str == null ? String.valueOf(par3ItemStack.stackSize) : par6Str; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); par1FontRenderer.drawStringWithShadow(var7, par4 + 19 - 2 - par1FontRenderer.getStringWidth(var7), par5 + 6 + 3, 16777215); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); } if (par3ItemStack.isItemDamaged()) { int var12 = (int)Math.round(13.0D - (double)par3ItemStack.getItemDamageForDisplay() * 13.0D / (double)par3ItemStack.getMaxDamage()); int var8 = (int)Math.round(255.0D - (double)par3ItemStack.getItemDamageForDisplay() * 255.0D / (double)par3ItemStack.getMaxDamage()); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); Tessellator var9 = Tessellator.instance; int var10 = 255 - var8 << 16 | var8 << 8; int var11 = (255 - var8) / 4 << 16 | 16128; this.renderQuad(var9, par4 + 2, par5 + 13, 13, 2, 0); this.renderQuad(var9, par4 + 2, par5 + 13, 12, 1, var11); this.renderQuad(var9, par4 + 2, par5 + 13, var12, 1, var10); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } } } diff --git a/src/main/java/net/minecraft/src/RenderItemFrame.java b/src/main/java/net/minecraft/src/RenderItemFrame.java index 61c5cda..5807d13 100644 --- a/src/main/java/net/minecraft/src/RenderItemFrame.java +++ b/src/main/java/net/minecraft/src/RenderItemFrame.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.adapter.Tessellator; public class RenderItemFrame extends Render @@ -18,17 +18,17 @@ public class RenderItemFrame extends Render public void func_82404_a(EntityItemFrame par1EntityItemFrame, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var10 = (float)(par1EntityItemFrame.posX - par2) - 0.5F; float var11 = (float)(par1EntityItemFrame.posY - par4) - 0.5F; float var12 = (float)(par1EntityItemFrame.posZ - par6) - 0.5F; int var13 = par1EntityItemFrame.xPosition + Direction.offsetX[par1EntityItemFrame.hangingDirection]; int var14 = par1EntityItemFrame.yPosition; int var15 = par1EntityItemFrame.zPosition + Direction.offsetZ[par1EntityItemFrame.hangingDirection]; - GL11.glTranslatef((float)var13 - var10, (float)var14 - var11, (float)var15 - var12); + EaglerAdapter.glTranslatef((float)var13 - var10, (float)var14 - var11, (float)var15 - var12); this.renderFrameItemAsBlock(par1EntityItemFrame); this.func_82402_b(par1EntityItemFrame); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation func_110788_a(EntityItemFrame par1EntityItemFrame) @@ -41,40 +41,40 @@ public class RenderItemFrame extends Render */ private void renderFrameItemAsBlock(EntityItemFrame par1EntityItemFrame) { - GL11.glPushMatrix(); - GL11.glRotatef(par1EntityItemFrame.rotationYaw, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glRotatef(par1EntityItemFrame.rotationYaw, 0.0F, 1.0F, 0.0F); TextureMap.locationBlocksTexture.bindTexture(); Block var2 = Block.planks; float var3 = 0.0625F; float var4 = 0.75F; float var5 = var4 / 2.0F; - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.renderBlocksInstance.overrideBlockBounds(0.0D, (double)(0.5F - var5 + 0.0625F), (double)(0.5F - var5 + 0.0625F), (double)(var3 * 0.5F), (double)(0.5F + var5 - 0.0625F), (double)(0.5F + var5 - 0.0625F)); this.renderBlocksInstance.setOverrideBlockTexture(this.field_94147_f); this.renderBlocksInstance.renderBlockAsItem(var2, 0, 1.0F); this.renderBlocksInstance.clearOverrideBlockTexture(); this.renderBlocksInstance.unlockBlockBounds(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); this.renderBlocksInstance.setOverrideBlockTexture(Block.planks.getIcon(1, 2)); - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.renderBlocksInstance.overrideBlockBounds(0.0D, (double)(0.5F - var5), (double)(0.5F - var5), (double)(var3 + 1.0E-4F), (double)(var3 + 0.5F - var5), (double)(0.5F + var5)); this.renderBlocksInstance.renderBlockAsItem(var2, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); this.renderBlocksInstance.overrideBlockBounds(0.0D, (double)(0.5F + var5 - var3), (double)(0.5F - var5), (double)(var3 + 1.0E-4F), (double)(0.5F + var5), (double)(0.5F + var5)); this.renderBlocksInstance.renderBlockAsItem(var2, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); this.renderBlocksInstance.overrideBlockBounds(0.0D, (double)(0.5F - var5), (double)(0.5F - var5), (double)var3, (double)(0.5F + var5), (double)(var3 + 0.5F - var5)); this.renderBlocksInstance.renderBlockAsItem(var2, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); this.renderBlocksInstance.overrideBlockBounds(0.0D, (double)(0.5F - var5), (double)(0.5F + var5 - var3), (double)var3, (double)(0.5F + var5), (double)(0.5F + var5)); this.renderBlocksInstance.renderBlockAsItem(var2, 0, 1.0F); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); this.renderBlocksInstance.unlockBlockBounds(); this.renderBlocksInstance.clearOverrideBlockTexture(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } private void func_82402_b(EntityItemFrame par1EntityItemFrame) { diff --git a/src/main/java/net/minecraft/src/RenderLeashKnot.java b/src/main/java/net/minecraft/src/RenderLeashKnot.java index ba296b7..68ec012 100644 --- a/src/main/java/net/minecraft/src/RenderLeashKnot.java +++ b/src/main/java/net/minecraft/src/RenderLeashKnot.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderLeashKnot extends Render @@ -11,16 +11,16 @@ public class RenderLeashKnot extends Render public void func_110799_a(EntityLeashKnot par1EntityLeashKnot, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); float var10 = 0.0625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(-1.0F, -1.0F, 1.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); this.bindEntityTexture(par1EntityLeashKnot); this.leashKnotModel.render(par1EntityLeashKnot, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, var10); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getLeashKnotTextures(EntityLeashKnot par1EntityLeashKnot) diff --git a/src/main/java/net/minecraft/src/RenderLightningBolt.java b/src/main/java/net/minecraft/src/RenderLightningBolt.java index b070cc3..c35aab2 100644 --- a/src/main/java/net/minecraft/src/RenderLightningBolt.java +++ b/src/main/java/net/minecraft/src/RenderLightningBolt.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderLightningBolt extends Render { @@ -14,10 +14,10 @@ public class RenderLightningBolt extends Render public void doRenderLightningBolt(EntityLightningBolt par1EntityLightningBolt, double par2, double par4, double par6, float par8, float par9) { Tessellator var10 = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE); double[] var11 = new double[8]; double[] var12 = new double[8]; double var13 = 0.0D; @@ -124,9 +124,9 @@ public class RenderLightningBolt extends Render } } - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } protected TextureLocation func_110805_a(EntityLightningBolt par1EntityLightningBolt) diff --git a/src/main/java/net/minecraft/src/RenderList.java b/src/main/java/net/minecraft/src/RenderList.java index 07185f3..111bc9e 100644 --- a/src/main/java/net/minecraft/src/RenderList.java +++ b/src/main/java/net/minecraft/src/RenderList.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.nio.IntBuffer; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderList { @@ -54,10 +54,10 @@ public class RenderList if (this.field_78424_g.remaining() > 0) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)((double)this.field_78429_a - this.field_78425_d), (float)((double)this.field_78427_b - this.field_78426_e), (float)((double)this.field_78428_c - this.field_78423_f)); - GL11.glCallLists(this.field_78424_g); - GL11.glPopMatrix(); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)((double)this.field_78429_a - this.field_78425_d), (float)((double)this.field_78427_b - this.field_78426_e), (float)((double)this.field_78428_c - this.field_78423_f)); + EaglerAdapter.glCallLists(this.field_78424_g); + EaglerAdapter.glPopMatrix(); } } } diff --git a/src/main/java/net/minecraft/src/RenderLiving.java b/src/main/java/net/minecraft/src/RenderLiving.java index f8ccfbc..8fba574 100644 --- a/src/main/java/net/minecraft/src/RenderLiving.java +++ b/src/main/java/net/minecraft/src/RenderLiving.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public abstract class RenderLiving extends RendererLivingEntity { @@ -62,9 +62,9 @@ public abstract class RenderLiving extends RendererLivingEntity double var38 = (double)((float)(var24 - var32)); double var40 = (double)((float)(var26 - var34)); double var42 = (double)((float)(var28 - var36)); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); boolean var44 = true; double var45 = 0.025D; var11.startDrawing(5); @@ -107,9 +107,9 @@ public abstract class RenderLiving extends RendererLivingEntity } var11.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); } } diff --git a/src/main/java/net/minecraft/src/RenderMagmaCube.java b/src/main/java/net/minecraft/src/RenderMagmaCube.java index 7810276..613e483 100644 --- a/src/main/java/net/minecraft/src/RenderMagmaCube.java +++ b/src/main/java/net/minecraft/src/RenderMagmaCube.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderMagmaCube extends RenderLiving { @@ -23,7 +23,7 @@ public class RenderMagmaCube extends RenderLiving float var4 = (par1EntityMagmaCube.prevSquishFactor + (par1EntityMagmaCube.squishFactor - par1EntityMagmaCube.prevSquishFactor) * par2) / ((float)var3 * 0.5F + 1.0F); float var5 = 1.0F / (var4 + 1.0F); float var6 = (float)var3; - GL11.glScalef(var5 * var6, 1.0F / var5 * var6, var5 * var6); + EaglerAdapter.glScalef(var5 * var6, 1.0F / var5 * var6, var5 * var6); } @Override diff --git a/src/main/java/net/minecraft/src/RenderManager.java b/src/main/java/net/minecraft/src/RenderManager.java index 1b0fee1..74c416d 100644 --- a/src/main/java/net/minecraft/src/RenderManager.java +++ b/src/main/java/net/minecraft/src/RenderManager.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.Map; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderManager { @@ -190,7 +190,7 @@ public class RenderManager int var11 = var10 % 65536; int var12 = var10 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var11 / 1.0F, (float)var12 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.renderEntityWithPosYaw(par1Entity, var3 - renderPosX, var5 - renderPosY, var7 - renderPosZ, var9, par2); } @@ -255,12 +255,12 @@ public class RenderManager private void func_85094_b(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - GL11.glDepthMask(false); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPushMatrix(); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glPushMatrix(); Tessellator var10 = Tessellator.instance; var10.startDrawingQuads(); var10.setColorRGBA(255, 255, 255, 32); @@ -290,12 +290,12 @@ public class RenderManager var10.addVertex(par2 + var11, par4, par6 + var13); var10.addVertex(par2 + var11, par4 + var27, par6 + var13); var10.draw(); - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthMask(true); } /** diff --git a/src/main/java/net/minecraft/src/RenderMinecart.java b/src/main/java/net/minecraft/src/RenderMinecart.java index bd1ec23..0c1a4e1 100644 --- a/src/main/java/net/minecraft/src/RenderMinecart.java +++ b/src/main/java/net/minecraft/src/RenderMinecart.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderMinecart extends Render { @@ -22,14 +22,14 @@ public class RenderMinecart extends Render */ public void renderTheMinecart(EntityMinecart par1EntityMinecart, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.bindEntityTexture(par1EntityMinecart); long var10 = (long)par1EntityMinecart.entityId * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; float var12 = (((float)(var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var13 = (((float)(var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var14 = (((float)(var10 >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; - GL11.glTranslatef(var12, var13, var14); + EaglerAdapter.glTranslatef(var12, var13, var14); double var15 = par1EntityMinecart.lastTickPosX + (par1EntityMinecart.posX - par1EntityMinecart.lastTickPosX) * (double)par9; double var17 = par1EntityMinecart.lastTickPosY + (par1EntityMinecart.posY - par1EntityMinecart.lastTickPosY) * (double)par9; double var19 = par1EntityMinecart.lastTickPosZ + (par1EntityMinecart.posZ - par1EntityMinecart.lastTickPosZ) * (double)par9; @@ -65,9 +65,9 @@ public class RenderMinecart extends Render } } - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var24, 0.0F, 0.0F, 1.0F); float var31 = (float)par1EntityMinecart.getRollingAmplitude() - par9; float var32 = par1EntityMinecart.getDamage() - par9; @@ -78,7 +78,7 @@ public class RenderMinecart extends Render if (var31 > 0.0F) { - GL11.glRotatef(MathHelper.sin(var31) * var31 * var32 / 10.0F * (float)par1EntityMinecart.getRollingDirection(), 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(MathHelper.sin(var31) * var31 * var32 / 10.0F * (float)par1EntityMinecart.getRollingDirection(), 1.0F, 0.0F, 0.0F); } int var33 = par1EntityMinecart.getDisplayTileOffset(); @@ -87,20 +87,20 @@ public class RenderMinecart extends Render if (var28 != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.bindTexture(TextureMap.locationBlocksTexture); float var30 = 0.75F; - GL11.glScalef(var30, var30, var30); - GL11.glTranslatef(0.0F, (float)var33 / 16.0F, 0.0F); + EaglerAdapter.glScalef(var30, var30, var30); + EaglerAdapter.glTranslatef(0.0F, (float)var33 / 16.0F, 0.0F); this.renderBlockInMinecart(par1EntityMinecart, par9, var28, var29); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.bindEntityTexture(par1EntityMinecart); } - GL11.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); this.modelMinecart.render(par1EntityMinecart, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getMinecartTextures(EntityMinecart par1EntityMinecart) @@ -114,9 +114,9 @@ public class RenderMinecart extends Render protected void renderBlockInMinecart(EntityMinecart par1EntityMinecart, float par2, Block par3Block, int par4) { float var5 = par1EntityMinecart.getBrightness(par2); - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.field_94145_f.renderBlockAsItem(par3Block, par4, var5); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } /** diff --git a/src/main/java/net/minecraft/src/RenderMooshroom.java b/src/main/java/net/minecraft/src/RenderMooshroom.java index ced7388..9678af2 100644 --- a/src/main/java/net/minecraft/src/RenderMooshroom.java +++ b/src/main/java/net/minecraft/src/RenderMooshroom.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderMooshroom extends RenderLiving { @@ -34,24 +34,24 @@ public class RenderMooshroom extends RenderLiving if (!par1EntityMooshroom.isChild()) { this.bindTexture(TextureMap.locationBlocksTexture); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPushMatrix(); - GL11.glScalef(1.0F, -1.0F, 1.0F); - GL11.glTranslatef(0.2F, 0.4F, 0.5F); - GL11.glRotatef(42.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(1.0F, -1.0F, 1.0F); + EaglerAdapter.glTranslatef(0.2F, 0.4F, 0.5F); + EaglerAdapter.glRotatef(42.0F, 0.0F, 1.0F, 0.0F); this.renderBlocks.renderBlockAsItem(Block.mushroomRed, 0, 1.0F); - GL11.glTranslatef(0.1F, 0.0F, -0.6F); - GL11.glRotatef(42.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.1F, 0.0F, -0.6F); + EaglerAdapter.glRotatef(42.0F, 0.0F, 1.0F, 0.0F); this.renderBlocks.renderBlockAsItem(Block.mushroomRed, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glPushMatrix(); ((ModelQuadruped)this.mainModel).head.postRender(0.0625F); - GL11.glScalef(1.0F, -1.0F, 1.0F); - GL11.glTranslatef(0.0F, 0.75F, -0.2F); - GL11.glRotatef(12.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(1.0F, -1.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, 0.75F, -0.2F); + EaglerAdapter.glRotatef(12.0F, 0.0F, 1.0F, 0.0F); this.renderBlocks.renderBlockAsItem(Block.mushroomRed, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); } } diff --git a/src/main/java/net/minecraft/src/RenderOcelot.java b/src/main/java/net/minecraft/src/RenderOcelot.java index dabb1fa..4955e56 100644 --- a/src/main/java/net/minecraft/src/RenderOcelot.java +++ b/src/main/java/net/minecraft/src/RenderOcelot.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderOcelot extends RenderLiving { @@ -67,7 +67,7 @@ public class RenderOcelot extends RenderLiving if (par1EntityOcelot.isTamed()) { - GL11.glScalef(0.8F, 0.8F, 0.8F); + EaglerAdapter.glScalef(0.8F, 0.8F, 0.8F); } } diff --git a/src/main/java/net/minecraft/src/RenderPainting.java b/src/main/java/net/minecraft/src/RenderPainting.java index 1001697..e0bcf44 100644 --- a/src/main/java/net/minecraft/src/RenderPainting.java +++ b/src/main/java/net/minecraft/src/RenderPainting.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderPainting extends Render @@ -11,17 +11,17 @@ public class RenderPainting extends Render public void renderThePainting(EntityPainting par1EntityPainting, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glRotatef(par8, 0.0F, 1.0F, 0.0F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glRotatef(par8, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); this.bindEntityTexture(par1EntityPainting); EnumArt var10 = par1EntityPainting.art; float var11 = 0.0625F; - GL11.glScalef(var11, var11, var11); + EaglerAdapter.glScalef(var11, var11, var11); this.func_77010_a(par1EntityPainting, var10.sizeX, var10.sizeY, var10.offsetX, var10.offsetY); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } protected TextureLocation func_110806_a(EntityPainting par1EntityPainting) @@ -127,7 +127,7 @@ public class RenderPainting extends Render int var8 = var7 % 65536; int var9 = var7 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var8, (float)var9); - GL11.glColor3f(1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor3f(1.0F, 1.0F, 1.0F); } /** diff --git a/src/main/java/net/minecraft/src/RenderPlayer.java b/src/main/java/net/minecraft/src/RenderPlayer.java index 5ab3ae6..46466e0 100644 --- a/src/main/java/net/minecraft/src/RenderPlayer.java +++ b/src/main/java/net/minecraft/src/RenderPlayer.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.DefaultSkinRenderer; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerProfile; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderPlayer extends RendererLivingEntity { @@ -59,7 +59,7 @@ public class RenderPlayer extends RendererLivingEntity float var10 = (float)(var9 >> 16 & 255) / 255.0F; float var11 = (float)(var9 >> 8 & 255) / 255.0F; float var12 = (float)(var9 & 255) / 255.0F; - GL11.glColor3f(var8 * var10, var8 * var11, var8 * var12); + EaglerAdapter.glColor3f(var8 * var10, var8 * var11, var8 * var12); if (var4.isItemEnchanted()) { @@ -69,7 +69,7 @@ public class RenderPlayer extends RendererLivingEntity return 16; } - GL11.glColor3f(var8, var8, var8); + EaglerAdapter.glColor3f(var8, var8, var8); if (var4.isItemEnchanted()) { @@ -95,7 +95,7 @@ public class RenderPlayer extends RendererLivingEntity { this.bindTexture(RenderBiped.func_110858_a((ItemArmor)var5, par2, "overlay")); float var6 = 1.0F; - GL11.glColor3f(var6, var6, var6); + EaglerAdapter.glColor3f(var6, var6, var6); } } } @@ -103,7 +103,7 @@ public class RenderPlayer extends RendererLivingEntity public void func_130009_a(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9) { float var10 = 1.0F; - GL11.glColor3f(var10, var10, var10); + EaglerAdapter.glColor3f(var10, var10, var10); ItemStack var11 = par1AbstractClientPlayer.inventory.getCurrentItem(); this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = var11 != null ? 1 : 0; @@ -362,7 +362,7 @@ public class RenderPlayer extends RendererLivingEntity protected void renderPlayerScale(EntityPlayer par1AbstractClientPlayer, float par2) { float var3 = 0.9375F; - GL11.glScalef(var3, var3, var3); + EaglerAdapter.glScalef(var3, var3, var3); } protected void func_96450_a(EntityPlayer par1AbstractClientPlayer, double par2, double par4, double par6, String par8Str, float par9, double par10) @@ -395,7 +395,7 @@ public class RenderPlayer extends RendererLivingEntity public void renderFirstPersonArm(EntityPlayer par1EntityPlayer) { float var2 = 1.0F; - GL11.glColor3f(var2, var2, var2); + EaglerAdapter.glColor3f(var2, var2, var2); this.modelBipedMain.onGround = 0.0F; this.modelBipedMain.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, par1EntityPlayer); this.modelBipedMain.bipedRightArm.render(0.0625F); @@ -423,9 +423,9 @@ public class RenderPlayer extends RendererLivingEntity { if (par1AbstractClientPlayer.isEntityAlive() && par1AbstractClientPlayer.isPlayerSleeping()) { - GL11.glRotatef(par1AbstractClientPlayer.getBedOrientationInDegrees(), 0.0F, 1.0F, 0.0F); - GL11.glRotatef(this.getDeathMaxRotation(par1AbstractClientPlayer), 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(par1AbstractClientPlayer.getBedOrientationInDegrees(), 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(this.getDeathMaxRotation(par1AbstractClientPlayer), 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(270.0F, 0.0F, 1.0F, 0.0F); } else { diff --git a/src/main/java/net/minecraft/src/RenderSheep.java b/src/main/java/net/minecraft/src/RenderSheep.java index 5435b9b..0c8f8c0 100644 --- a/src/main/java/net/minecraft/src/RenderSheep.java +++ b/src/main/java/net/minecraft/src/RenderSheep.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSheep extends RenderLiving { @@ -21,7 +21,7 @@ public class RenderSheep extends RenderLiving this.bindTexture(sheepTextures); float var4 = 1.0F; int var5 = par1EntitySheep.getFleeceColor(); - GL11.glColor3f(var4 * EntitySheep.fleeceColorTable[var5][0], var4 * EntitySheep.fleeceColorTable[var5][1], var4 * EntitySheep.fleeceColorTable[var5][2]); + EaglerAdapter.glColor3f(var4 * EntitySheep.fleeceColorTable[var5][0], var4 * EntitySheep.fleeceColorTable[var5][1], var4 * EntitySheep.fleeceColorTable[var5][2]); return 1; } else diff --git a/src/main/java/net/minecraft/src/RenderSkeleton.java b/src/main/java/net/minecraft/src/RenderSkeleton.java index 351508b..ae4b8e4 100644 --- a/src/main/java/net/minecraft/src/RenderSkeleton.java +++ b/src/main/java/net/minecraft/src/RenderSkeleton.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSkeleton extends RenderBiped { @@ -17,13 +17,13 @@ public class RenderSkeleton extends RenderBiped { if (par1EntitySkeleton.getSkeletonType() == 1) { - GL11.glScalef(1.2F, 1.2F, 1.2F); + EaglerAdapter.glScalef(1.2F, 1.2F, 1.2F); } } protected void func_82422_c() { - GL11.glTranslatef(0.09375F, 0.1875F, 0.0F); + EaglerAdapter.glTranslatef(0.09375F, 0.1875F, 0.0F); } protected TextureLocation func_110860_a(EntitySkeleton par1EntitySkeleton) diff --git a/src/main/java/net/minecraft/src/RenderSlime.java b/src/main/java/net/minecraft/src/RenderSlime.java index 7cf1c1c..3d9e4ea 100644 --- a/src/main/java/net/minecraft/src/RenderSlime.java +++ b/src/main/java/net/minecraft/src/RenderSlime.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSlime extends RenderLiving { @@ -26,17 +26,17 @@ public class RenderSlime extends RenderLiving else if (par2 == 0) { this.setRenderPassModel(this.scaleAmount); - GL11.glEnable(GL11.GL_NORMALIZE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_NORMALIZE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); return 1; } else { if (par2 == 1) { - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } return -1; @@ -51,7 +51,7 @@ public class RenderSlime extends RenderLiving float var3 = (float)par1EntitySlime.getSlimeSize(); float var4 = (par1EntitySlime.prevSquishFactor + (par1EntitySlime.squishFactor - par1EntitySlime.prevSquishFactor) * par2) / (var3 * 0.5F + 1.0F); float var5 = 1.0F / (var4 + 1.0F); - GL11.glScalef(var5 * var3, 1.0F / var5 * var3, var5 * var3); + EaglerAdapter.glScalef(var5 * var3, 1.0F / var5 * var3, var5 * var3); } protected TextureLocation getSlimeTextures(EntitySlime par1EntitySlime) diff --git a/src/main/java/net/minecraft/src/RenderSnowMan.java b/src/main/java/net/minecraft/src/RenderSnowMan.java index 273845b..36df63d 100644 --- a/src/main/java/net/minecraft/src/RenderSnowMan.java +++ b/src/main/java/net/minecraft/src/RenderSnowMan.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSnowMan extends RenderLiving { @@ -27,19 +27,19 @@ public class RenderSnowMan extends RenderLiving if (var3 != null && var3.getItem().itemID < 256) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); this.snowmanModel.head.postRender(0.0625F); if (RenderBlocks.renderItemIn3d(Block.blocksList[var3.itemID].getRenderType())) { float var4 = 0.625F; - GL11.glTranslatef(0.0F, -0.34375F, 0.0F); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(var4, -var4, var4); + EaglerAdapter.glTranslatef(0.0F, -0.34375F, 0.0F); + EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var4, -var4, var4); } this.renderManager.itemRenderer.renderItem(par1EntitySnowman, var3, 0); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } diff --git a/src/main/java/net/minecraft/src/RenderSnowball.java b/src/main/java/net/minecraft/src/RenderSnowball.java index 7572da1..7f21c89 100644 --- a/src/main/java/net/minecraft/src/RenderSnowball.java +++ b/src/main/java/net/minecraft/src/RenderSnowball.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderSnowball extends Render @@ -33,10 +33,10 @@ public class RenderSnowball extends Render if (var10 != null) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); this.bindEntityTexture(par1Entity); Tessellator var11 = Tessellator.instance; @@ -46,16 +46,16 @@ public class RenderSnowball extends Render float var13 = (float)(var12 >> 16 & 255) / 255.0F; float var14 = (float)(var12 >> 8 & 255) / 255.0F; float var15 = (float)(var12 & 255) / 255.0F; - GL11.glColor3f(var13, var14, var15); - GL11.glPushMatrix(); + EaglerAdapter.glColor3f(var13, var14, var15); + EaglerAdapter.glPushMatrix(); this.func_77026_a(var11, ItemPotion.func_94589_d("overlay")); - GL11.glPopMatrix(); - GL11.glColor3f(1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor3f(1.0F, 1.0F, 1.0F); } this.func_77026_a(var11, var10); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } } @@ -76,8 +76,8 @@ public class RenderSnowball extends Render float var7 = 1.0F; float var8 = 0.5F; float var9 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); par1Tessellator.addVertexWithUV((double)(0.0F - var8), (double)(0.0F - var9), 0.0D, (double)var3, (double)var6); diff --git a/src/main/java/net/minecraft/src/RenderSpider.java b/src/main/java/net/minecraft/src/RenderSpider.java index 34b6c80..c6fedfb 100644 --- a/src/main/java/net/minecraft/src/RenderSpider.java +++ b/src/main/java/net/minecraft/src/RenderSpider.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSpider extends RenderLiving { @@ -32,25 +32,25 @@ public class RenderSpider extends RenderLiving { this.bindTexture(spiderEyesTextures); float var4 = 1.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); if (par1EntitySpider.isInvisible()) { - GL11.glDepthMask(false); + EaglerAdapter.glDepthMask(false); } else { - GL11.glDepthMask(true); + EaglerAdapter.glDepthMask(true); } char var5 = 61680; int var6 = var5 % 65536; int var7 = var5 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var6 / 1.0F, (float)var7 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, var4); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, var4); return 1; } } diff --git a/src/main/java/net/minecraft/src/RenderSquid.java b/src/main/java/net/minecraft/src/RenderSquid.java index 28344dd..283fb61 100644 --- a/src/main/java/net/minecraft/src/RenderSquid.java +++ b/src/main/java/net/minecraft/src/RenderSquid.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderSquid extends RenderLiving { @@ -37,11 +37,11 @@ public class RenderSquid extends RenderLiving { float var5 = par1EntitySquid.prevSquidPitch + (par1EntitySquid.squidPitch - par1EntitySquid.prevSquidPitch) * par4; float var6 = par1EntitySquid.prevSquidYaw + (par1EntitySquid.squidYaw - par1EntitySquid.prevSquidYaw) * par4; - GL11.glTranslatef(0.0F, 0.5F, 0.0F); - GL11.glRotatef(180.0F - par3, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(var5, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(var6, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.2F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.5F, 0.0F); + EaglerAdapter.glRotatef(180.0F - par3, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(var5, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(var6, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -1.2F, 0.0F); } protected float handleRotationFloat(EntitySquid par1EntitySquid, float par2) diff --git a/src/main/java/net/minecraft/src/RenderTNTPrimed.java b/src/main/java/net/minecraft/src/RenderTNTPrimed.java index 62c3d2d..256a7c4 100644 --- a/src/main/java/net/minecraft/src/RenderTNTPrimed.java +++ b/src/main/java/net/minecraft/src/RenderTNTPrimed.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderTNTPrimed extends Render { @@ -14,8 +14,8 @@ public class RenderTNTPrimed extends Render public void renderPrimedTNT(EntityTNTPrimed par1EntityTNTPrimed, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); float var10; if ((float)par1EntityTNTPrimed.fuse - par9 + 1.0F < 10.0F) @@ -35,7 +35,7 @@ public class RenderTNTPrimed extends Render var10 *= var10; var10 *= var10; float var11 = 1.0F + var10 * 0.3F; - GL11.glScalef(var11, var11, var11); + EaglerAdapter.glScalef(var11, var11, var11); } var10 = (1.0F - ((float)par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F; @@ -44,19 +44,19 @@ public class RenderTNTPrimed extends Render if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, var10); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_DST_ALPHA); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, var10); this.blockRenderer.renderBlockAsItem(Block.tnt, 0, 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation func_110808_a(EntityTNTPrimed par1EntityTNTPrimed) diff --git a/src/main/java/net/minecraft/src/RenderTntMinecart.java b/src/main/java/net/minecraft/src/RenderTntMinecart.java index 44366c7..28bfae3 100644 --- a/src/main/java/net/minecraft/src/RenderTntMinecart.java +++ b/src/main/java/net/minecraft/src/RenderTntMinecart.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderTntMinecart extends RenderMinecart { @@ -25,25 +25,25 @@ public class RenderTntMinecart extends RenderMinecart var6 *= var6; var6 *= var6; float var7 = 1.0F + var6 * 0.3F; - GL11.glScalef(var7, var7, var7); + EaglerAdapter.glScalef(var7, var7, var7); } super.renderBlockInMinecart(par1EntityMinecartTNT, par2, par3Block, par4); if (var5 > -1 && var5 / 5 % 2 == 0) { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (1.0F - ((float)var5 - par2 + 1.0F) / 100.0F) * 0.8F); - GL11.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_DST_ALPHA); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, (1.0F - ((float)var5 - par2 + 1.0F) / 100.0F) * 0.8F); + EaglerAdapter.glPushMatrix(); this.field_94145_f.renderBlockAsItem(Block.tnt, 0, 1.0F); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } } diff --git a/src/main/java/net/minecraft/src/RenderVillager.java b/src/main/java/net/minecraft/src/RenderVillager.java index d25ed80..804617f 100644 --- a/src/main/java/net/minecraft/src/RenderVillager.java +++ b/src/main/java/net/minecraft/src/RenderVillager.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderVillager extends RenderLiving { @@ -77,7 +77,7 @@ public class RenderVillager extends RenderLiving this.shadowSize = 0.5F; } - GL11.glScalef(var3, var3, var3); + EaglerAdapter.glScalef(var3, var3, var3); } public void doRenderLiving(EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) diff --git a/src/main/java/net/minecraft/src/RenderWitch.java b/src/main/java/net/minecraft/src/RenderWitch.java index ca6c86e..7e52f48 100644 --- a/src/main/java/net/minecraft/src/RenderWitch.java +++ b/src/main/java/net/minecraft/src/RenderWitch.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderWitch extends RenderLiving { @@ -29,43 +29,43 @@ public class RenderWitch extends RenderLiving protected void func_82411_a(EntityWitch par1EntityWitch, float par2) { float var3 = 1.0F; - GL11.glColor3f(var3, var3, var3); + EaglerAdapter.glColor3f(var3, var3, var3); super.renderEquippedItems(par1EntityWitch, par2); ItemStack var4 = par1EntityWitch.getHeldItem(); if (var4 != null) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var5; if (this.mainModel.isChild) { var5 = 0.5F; - GL11.glTranslatef(0.0F, 0.625F, 0.0F); - GL11.glRotatef(-20.0F, -1.0F, 0.0F, 0.0F); - GL11.glScalef(var5, var5, var5); + EaglerAdapter.glTranslatef(0.0F, 0.625F, 0.0F); + EaglerAdapter.glRotatef(-20.0F, -1.0F, 0.0F, 0.0F); + EaglerAdapter.glScalef(var5, var5, var5); } this.witchModel.villagerNose.postRender(0.0625F); - GL11.glTranslatef(-0.0625F, 0.53125F, 0.21875F); + EaglerAdapter.glTranslatef(-0.0625F, 0.53125F, 0.21875F); if (var4.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var4.itemID].getRenderType())) { var5 = 0.5F; - GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); + EaglerAdapter.glTranslatef(0.0F, 0.1875F, -0.3125F); var5 *= 0.75F; - GL11.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(var5, -var5, var5); + EaglerAdapter.glRotatef(20.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var5, -var5, var5); } else if (var4.itemID == Item.bow.itemID) { var5 = 0.625F; - GL11.glTranslatef(0.0F, 0.125F, 0.3125F); - GL11.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(var5, -var5, var5); - GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.125F, 0.3125F); + EaglerAdapter.glRotatef(-20.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var5, -var5, var5); + EaglerAdapter.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } else if (Item.itemsList[var4.itemID].isFull3D()) { @@ -73,27 +73,27 @@ public class RenderWitch extends RenderLiving if (Item.itemsList[var4.itemID].shouldRotateAroundWhenRendering()) { - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -0.125F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, -0.125F, 0.0F); } this.func_82410_b(); - GL11.glScalef(var5, -var5, var5); - GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glScalef(var5, -var5, var5); + EaglerAdapter.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); } else { var5 = 0.375F; - GL11.glTranslatef(0.25F, 0.1875F, -0.1875F); - GL11.glScalef(var5, var5, var5); - GL11.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.25F, 0.1875F, -0.1875F); + EaglerAdapter.glScalef(var5, var5, var5); + EaglerAdapter.glRotatef(60.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(20.0F, 0.0F, 0.0F, 1.0F); } - GL11.glRotatef(-15.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(40.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(-15.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(40.0F, 0.0F, 0.0F, 1.0F); this.renderManager.itemRenderer.renderItem(par1EntityWitch, var4, 0); if (var4.getItem().requiresMultipleRenderPasses()) @@ -101,19 +101,19 @@ public class RenderWitch extends RenderLiving this.renderManager.itemRenderer.renderItem(par1EntityWitch, var4, 1); } - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } } protected void func_82410_b() { - GL11.glTranslatef(0.0F, 0.1875F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, 0.1875F, 0.0F); } protected void func_82409_b(EntityWitch par1EntityWitch, float par2) { float var3 = 0.9375F; - GL11.glScalef(var3, var3, var3); + EaglerAdapter.glScalef(var3, var3, var3); } public void doRenderLiving(EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) diff --git a/src/main/java/net/minecraft/src/RenderWither.java b/src/main/java/net/minecraft/src/RenderWither.java index a901db8..c4f9ab2 100644 --- a/src/main/java/net/minecraft/src/RenderWither.java +++ b/src/main/java/net/minecraft/src/RenderWither.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderWither extends RenderLiving { @@ -42,11 +42,11 @@ public class RenderWither extends RenderLiving if (var3 > 0) { float var4 = 2.0F - ((float)var3 - par2) / 220.0F * 0.5F; - GL11.glScalef(var4, var4, var4); + EaglerAdapter.glScalef(var4, var4, var4); } else { - GL11.glScalef(2.0F, 2.0F, 2.0F); + EaglerAdapter.glScalef(2.0F, 2.0F, 2.0F); } } @@ -56,41 +56,41 @@ public class RenderWither extends RenderLiving { if (par1EntityWither.isInvisible()) { - GL11.glDepthMask(false); + EaglerAdapter.glDepthMask(false); } else { - GL11.glDepthMask(true); + EaglerAdapter.glDepthMask(true); } if (par2 == 1) { float var4 = (float)par1EntityWither.ticksExisted + par3; this.bindTexture(invulnerableWitherTextures); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glLoadIdentity(); float var5 = MathHelper.cos(var4 * 0.02F) * 3.0F; float var6 = var4 * 0.01F; - GL11.glTranslatef(var5, var6, 0.0F); + EaglerAdapter.glTranslatef(var5, var6, 0.0F); this.setRenderPassModel(this.mainModel); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); float var7 = 0.5F; - GL11.glColor4f(var7, var7, var7, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); - GL11.glTranslatef(0.0F, -0.01F, 0.0F); - GL11.glScalef(1.1F, 1.1F, 1.1F); + EaglerAdapter.glColor4f(var7, var7, var7, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_ONE, EaglerAdapter.GL_ONE); + EaglerAdapter.glTranslatef(0.0F, -0.01F, 0.0F); + EaglerAdapter.glScalef(1.1F, 1.1F, 1.1F); return 1; } if (par2 == 2) { - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } } diff --git a/src/main/java/net/minecraft/src/RenderWitherSkull.java b/src/main/java/net/minecraft/src/RenderWitherSkull.java index 1a06088..4a546cd 100644 --- a/src/main/java/net/minecraft/src/RenderWitherSkull.java +++ b/src/main/java/net/minecraft/src/RenderWitherSkull.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderWitherSkull extends Render @@ -31,18 +31,18 @@ public class RenderWitherSkull extends Render public void func_82399_a(EntityWitherSkull par1EntityWitherSkull, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); float var10 = this.func_82400_a(par1EntityWitherSkull.prevRotationYaw, par1EntityWitherSkull.rotationYaw, par9); float var11 = par1EntityWitherSkull.prevRotationPitch + (par1EntityWitherSkull.rotationPitch - par1EntityWitherSkull.prevRotationPitch) * par9; - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); float var12 = 0.0625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(-1.0F, -1.0F, 1.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); this.bindEntityTexture(par1EntityWitherSkull); this.skeletonHeadModel.render(par1EntityWitherSkull, 0.0F, 0.0F, 0.0F, var10, var11, var12); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } protected TextureLocation func_110809_a(EntityWitherSkull par1EntityWitherSkull) diff --git a/src/main/java/net/minecraft/src/RenderWolf.java b/src/main/java/net/minecraft/src/RenderWolf.java index 171eff3..621543e 100644 --- a/src/main/java/net/minecraft/src/RenderWolf.java +++ b/src/main/java/net/minecraft/src/RenderWolf.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class RenderWolf extends RenderLiving { @@ -29,7 +29,7 @@ public class RenderWolf extends RenderLiving { var4 = par1EntityWolf.getBrightness(par3) * par1EntityWolf.getShadingWhileShaking(par3); this.bindTexture(wolfTextures); - GL11.glColor3f(var4, var4, var4); + EaglerAdapter.glColor3f(var4, var4, var4); return 1; } else if (par2 == 1 && par1EntityWolf.isTamed()) @@ -37,7 +37,7 @@ public class RenderWolf extends RenderLiving this.bindTexture(wolfCollarTextures); var4 = 1.0F; int var5 = par1EntityWolf.getCollarColor(); - GL11.glColor3f(var4 * EntitySheep.fleeceColorTable[var5][0], var4 * EntitySheep.fleeceColorTable[var5][1], var4 * EntitySheep.fleeceColorTable[var5][2]); + EaglerAdapter.glColor3f(var4 * EntitySheep.fleeceColorTable[var5][0], var4 * EntitySheep.fleeceColorTable[var5][1], var4 * EntitySheep.fleeceColorTable[var5][2]); return 1; } else diff --git a/src/main/java/net/minecraft/src/RenderXPOrb.java b/src/main/java/net/minecraft/src/RenderXPOrb.java index 090a0da..c8e4f56 100644 --- a/src/main/java/net/minecraft/src/RenderXPOrb.java +++ b/src/main/java/net/minecraft/src/RenderXPOrb.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class RenderXPOrb extends Render @@ -20,8 +20,8 @@ public class RenderXPOrb extends Render */ public void renderTheXPOrb(EntityXPOrb par1EntityXPOrb, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); this.bindEntityTexture(par1EntityXPOrb); int var10 = par1EntityXPOrb.getTextureByXP(); float var11 = (float)(var10 % 4 * 16 + 0) / 64.0F; @@ -35,17 +35,17 @@ public class RenderXPOrb extends Render int var19 = var18 % 65536; int var20 = var18 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var19 / 1.0F, (float)var20 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var26 = 255.0F; float var27 = ((float)par1EntityXPOrb.xpColor + par9) / 2.0F; var20 = (int)((MathHelper.sin(var27 + 0.0F) + 1.0F) * 0.5F * var26); int var21 = (int)var26; int var22 = (int)((MathHelper.sin(var27 + 4.1887903F) + 1.0F) * 0.1F * var26); int var23 = var20 << 16 | var21 << 8 | var22; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); float var24 = 0.3F; - GL11.glScalef(var24, var24, var24); + EaglerAdapter.glScalef(var24, var24, var24); Tessellator var25 = Tessellator.instance; var25.startDrawingQuads(); var25.setColorRGBA_I(var23, 128); @@ -55,9 +55,9 @@ public class RenderXPOrb extends Render var25.addVertexWithUV((double)(var15 - var16), (double)(1.0F - var17), 0.0D, (double)var12, (double)var13); var25.addVertexWithUV((double)(0.0F - var16), (double)(1.0F - var17), 0.0D, (double)var11, (double)var13); var25.draw(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); } protected TextureLocation getExperienceOrbTextures(EntityXPOrb par1EntityXPOrb) diff --git a/src/main/java/net/minecraft/src/RendererLivingEntity.java b/src/main/java/net/minecraft/src/RendererLivingEntity.java index b256496..0d18025 100644 --- a/src/main/java/net/minecraft/src/RendererLivingEntity.java +++ b/src/main/java/net/minecraft/src/RendererLivingEntity.java @@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public abstract class RendererLivingEntity extends Render @@ -54,8 +54,8 @@ public abstract class RendererLivingEntity extends Render public void doRenderLiving(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6, float par8, float par9) { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); this.mainModel.onGround = this.renderSwingProgress(par1EntityLivingBase, par9); if (this.renderPassModel != null) @@ -112,10 +112,10 @@ public abstract class RendererLivingEntity extends Render var13 = this.handleRotationFloat(par1EntityLivingBase, par9); this.rotateCorpse(par1EntityLivingBase, var13, var10, par9); float var14 = 0.0625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); this.preRenderCallback(par1EntityLivingBase, par9); - GL11.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F, 0.0F); float var15 = par1EntityLivingBase.prevLimbSwingAmount + (par1EntityLivingBase.limbSwingAmount - par1EntityLivingBase.prevLimbSwingAmount) * par9; float var16 = par1EntityLivingBase.limbSwing - par1EntityLivingBase.limbSwingAmount * (1.0F - par9); @@ -129,7 +129,7 @@ public abstract class RendererLivingEntity extends Render var15 = 1.0F; } - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); this.mainModel.setLivingAnimations(par1EntityLivingBase, var16, var15, par9); this.renderModel(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); int var18; @@ -156,70 +156,70 @@ public abstract class RendererLivingEntity extends Render { var19 = (float)par1EntityLivingBase.ticksExisted + par9; this.bindTexture(RES_ITEM_GLINT); - GL11.glEnable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); var20 = 0.5F; - GL11.glColor4f(var20, var20, var20, 1.0F); - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDepthMask(false); + EaglerAdapter.glColor4f(var20, var20, var20, 1.0F); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); + EaglerAdapter.glDepthMask(false); for (int var21 = 0; var21 < 2; ++var21) { - GL11.glDisable(GL11.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); var22 = 0.76F; - GL11.glColor4f(0.5F * var22, 0.25F * var22, 0.8F * var22, 1.0F); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); + EaglerAdapter.glColor4f(0.5F * var22, 0.25F * var22, 0.8F * var22, 1.0F); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_COLOR, EaglerAdapter.GL_ONE); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glLoadIdentity(); float var23 = var19 * (0.001F + (float)var21 * 0.003F) * 20.0F; float var24 = 0.33333334F; - GL11.glScalef(var24, var24, var24); - GL11.glRotatef(30.0F - (float)var21 * 60.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, var23, 0.0F); - GL11.glMatrixMode(GL11.GL_MODELVIEW); + EaglerAdapter.glScalef(var24, var24, var24); + EaglerAdapter.glRotatef(30.0F - (float)var21 * 60.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, var23, 0.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); this.renderPassModel.render(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glDepthMask(true); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthFunc(GL11.GL_LEQUAL); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_TEXTURE); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glLoadIdentity(); + EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); } } - GL11.glDepthMask(true); + EaglerAdapter.glDepthMask(true); this.renderEquippedItems(par1EntityLivingBase, par9); float var27 = par1EntityLivingBase.getBrightness(par9); var18 = this.getColorMultiplier(par1EntityLivingBase, var27, par9); OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); if ((var18 >> 24 & 255) > 0 || par1EntityLivingBase.hurtTime > 0 || par1EntityLivingBase.deathTime > 0) { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthFunc(GL11.GL_EQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); if (par1EntityLivingBase.hurtTime > 0 || par1EntityLivingBase.deathTime > 0) { - GL11.glColor4f(var27, 0.0F, 0.0F, 0.4F); + EaglerAdapter.glColor4f(var27, 0.0F, 0.0F, 0.4F); this.mainModel.render(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); for (int var28 = 0; var28 < 4; ++var28) { if (this.inheritRenderPass(par1EntityLivingBase, var28, par9) >= 0) { - GL11.glColor4f(var27, 0.0F, 0.0F, 0.4F); + EaglerAdapter.glColor4f(var27, 0.0F, 0.0F, 0.4F); this.renderPassModel.render(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); } } @@ -231,26 +231,26 @@ public abstract class RendererLivingEntity extends Render var20 = (float)(var18 >> 8 & 255) / 255.0F; float var29 = (float)(var18 & 255) / 255.0F; var22 = (float)(var18 >> 24 & 255) / 255.0F; - GL11.glColor4f(var19, var20, var29, var22); + EaglerAdapter.glColor4f(var19, var20, var29, var22); this.mainModel.render(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); for (int var30 = 0; var30 < 4; ++var30) { if (this.inheritRenderPass(par1EntityLivingBase, var30, par9) >= 0) { - GL11.glColor4f(var19, var20, var29, var22); + EaglerAdapter.glColor4f(var19, var20, var29, var22); this.renderPassModel.render(par1EntityLivingBase, var16, var15, var13, var11 - var10, var26, var14); } } } - GL11.glDepthFunc(GL11.GL_LEQUAL); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); } catch (Exception var25) { @@ -258,10 +258,10 @@ public abstract class RendererLivingEntity extends Render } OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glPopMatrix(); this.passSpecialRender(par1EntityLivingBase, par2, par4, par6); } @@ -278,17 +278,17 @@ public abstract class RendererLivingEntity extends Render } else if (!par1EntityLivingBase.isInvisibleToPlayer(Minecraft.getMinecraft().thePlayer)) { - GL11.glPushMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.15F); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 0.15F); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.003921569F); this.mainModel.render(par1EntityLivingBase, par2, par3, par4, par5, par6, par7); - GL11.glDisable(GL11.GL_BLEND); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - GL11.glPopMatrix(); - GL11.glDepthMask(true); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glAlphaFunc(EaglerAdapter.GL_GREATER, 0.1F); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glDepthMask(true); } else { @@ -303,12 +303,12 @@ public abstract class RendererLivingEntity extends Render */ protected void renderLivingAt(EntityLivingBase par1EntityLivingBase, double par2, double par4, double par6) { - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); } protected void rotateCorpse(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4) { - GL11.glRotatef(180.0F - par3, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(180.0F - par3, 0.0F, 1.0F, 0.0F); if (par1EntityLivingBase.deathTime > 0) { @@ -320,7 +320,7 @@ public abstract class RendererLivingEntity extends Render var5 = 1.0F; } - GL11.glRotatef(var5 * this.getDeathMaxRotation(par1EntityLivingBase), 0.0F, 0.0F, 1.0F); + EaglerAdapter.glRotatef(var5 * this.getDeathMaxRotation(par1EntityLivingBase), 0.0F, 0.0F, 1.0F); } else { @@ -328,8 +328,8 @@ public abstract class RendererLivingEntity extends Render if ((var6.equals("Dinnerbone") || var6.equals("Grumm")) && (!(par1EntityLivingBase instanceof EntityPlayer) || !((EntityPlayer)par1EntityLivingBase).getHideCape())) { - GL11.glTranslatef(0.0F, par1EntityLivingBase.height + 0.1F, 0.0F); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + EaglerAdapter.glTranslatef(0.0F, par1EntityLivingBase.height + 0.1F, 0.0F); + EaglerAdapter.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); } } } @@ -364,7 +364,7 @@ public abstract class RendererLivingEntity extends Render for (int var6 = 0; var6 < var3; ++var6) { - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); ModelRenderer var7 = this.mainModel.getRandomModelBox(var5); ModelBox var8 = (ModelBox)var7.cubeList.get(var5.nextInt(var7.cubeList.size())); var7.postRender(0.0625F); @@ -374,7 +374,7 @@ public abstract class RendererLivingEntity extends Render float var12 = (var8.posX1 + (var8.posX2 - var8.posX1) * var9) / 16.0F; float var13 = (var8.posY1 + (var8.posY2 - var8.posY1) * var10) / 16.0F; float var14 = (var8.posZ1 + (var8.posZ2 - var8.posZ1) * var11) / 16.0F; - GL11.glTranslatef(var12, var13, var14); + EaglerAdapter.glTranslatef(var12, var13, var14); var9 = var9 * 2.0F - 1.0F; var10 = var10 * 2.0F - 1.0F; var11 = var11 * 2.0F - 1.0F; @@ -389,7 +389,7 @@ public abstract class RendererLivingEntity extends Render double var20 = 0.0D; float var22 = 0.0F; this.renderManager.renderEntityWithPosYaw(var4, var16, var18, var20, var22, par2); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } RenderHelper.enableStandardItemLighting(); @@ -449,19 +449,19 @@ public abstract class RendererLivingEntity extends Render if (par1EntityLivingBase.isSneaking()) { FontRenderer var14 = this.getFontRendererFromRenderManager(); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2 + 0.0F, (float)par4 + par1EntityLivingBase.height + 0.5F, (float)par6); - GL11.glNormal3f(0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - GL11.glScalef(-var9, -var9, var9); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glTranslatef(0.0F, 0.25F / var9, 0.0F); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2 + 0.0F, (float)par4 + par1EntityLivingBase.height + 0.5F, (float)par6); + EaglerAdapter.glNormal3f(0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glScalef(-var9, -var9, var9); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glTranslatef(0.0F, 0.25F / var9, 0.0F); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); Tessellator var15 = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var15.startDrawingQuads(); int var16 = var14.getStringWidth(var13) / 2; var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); @@ -470,13 +470,13 @@ public abstract class RendererLivingEntity extends Render var15.addVertex((double)(var16 + 1), 8.0D, 0.0D); var15.addVertex((double)(var16 + 1), -1.0D, 0.0D); var15.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDepthMask(true); var14.drawString(var13, -var14.getStringWidth(var13) / 2, 0, 553648127); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); } else { @@ -515,17 +515,17 @@ public abstract class RendererLivingEntity extends Render FontRenderer var12 = this.getFontRendererFromRenderManager(); float var13 = 1.6F; float var14 = 0.016666668F * var13; - GL11.glPushMatrix(); - GL11.glTranslatef((float)par3 + 0.0F, (float)par5 + par1EntityLivingBase.height + 0.5F, (float)par7); - GL11.glNormal3f(0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - GL11.glScalef(-var14, -var14, var14); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par3 + 0.0F, (float)par5 + par1EntityLivingBase.height + 0.5F, (float)par7); + EaglerAdapter.glNormal3f(0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glScalef(-var14, -var14, var14); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDepthMask(false); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); Tessellator var15 = Tessellator.instance; byte var16 = 0; @@ -534,7 +534,7 @@ public abstract class RendererLivingEntity extends Render var16 = -10; } - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var15.startDrawingQuads(); int var17 = var12.getStringWidth(par2Str) / 2; var15.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); @@ -543,15 +543,15 @@ public abstract class RendererLivingEntity extends Render var15.addVertex((double)(var17 + 1), (double)(8 + var16), 0.0D); var15.addVertex((double)(var17 + 1), (double)(-1 + var16), 0.0D); var15.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, 553648127); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); + EaglerAdapter.glDepthMask(true); var12.drawString(par2Str, -var12.getStringWidth(par2Str) / 2, var16, -1); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glPopMatrix(); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); } } diff --git a/src/main/java/net/minecraft/src/ScreenShotHelper.java b/src/main/java/net/minecraft/src/ScreenShotHelper.java index 867106b..2f52bcc 100644 --- a/src/main/java/net/minecraft/src/ScreenShotHelper.java +++ b/src/main/java/net/minecraft/src/ScreenShotHelper.java @@ -8,7 +8,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import javax.imageio.ImageIO; import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class ScreenShotHelper @@ -27,45 +27,7 @@ public class ScreenShotHelper public static String func_74292_a(File par0File, String par1Str, int par2, int par3) { - try - { - File var4 = new File(par0File, "screenshots"); - var4.mkdir(); - int var5 = par2 * par3; - - if (field_74293_b == null || field_74293_b.capacity() < var5) - { - field_74293_b = BufferUtils.createIntBuffer(var5); - field_74294_c = new int[var5]; - } - - GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, 1); - GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); - field_74293_b.clear(); - GL11.glReadPixels(0, 0, par2, par3, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, field_74293_b); - field_74293_b.get(field_74294_c); - func_74289_a(field_74294_c, par2, par3); - BufferedImage var6 = new BufferedImage(par2, par3, 1); - var6.setRGB(0, 0, par2, par3, field_74294_c, 0, par2); - File var7; - - if (par1Str == null) - { - var7 = func_74290_a(var4); - } - else - { - var7 = new File(var4, par1Str); - } - - ImageIO.write(var6, "png", var7); - return "Saved screenshot as " + var7.getName(); - } - catch (Exception var8) - { - var8.printStackTrace(); - return "Failed to save: " + var8; - } + return "Cannot save screenshots dumbass"; } private static File func_74290_a(File par0File) diff --git a/src/main/java/net/minecraft/src/SelectionListBase.java b/src/main/java/net/minecraft/src/SelectionListBase.java index bd95ed9..5715948 100644 --- a/src/main/java/net/minecraft/src/SelectionListBase.java +++ b/src/main/java/net/minecraft/src/SelectionListBase.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public abstract class SelectionListBase { @@ -183,11 +183,11 @@ public abstract class SelectionListBase } this.func_96614_f(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_FOG); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_FOG); Tessellator var18 = Tessellator.instance; Gui.optionsBackground.bindTexture(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var17 = 32.0F; var18.startDrawingQuads(); var18.setColorOpaque_I(2105376); @@ -211,8 +211,8 @@ public abstract class SelectionListBase { var14 = this.field_96619_e + 2; int var15 = this.field_96617_g - 2; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorOpaque_I(8421504); var18.addVertexWithUV((double)var14, (double)(var20 + var13 + 2), 0.0D, 0.0D, 1.0D); @@ -225,20 +225,20 @@ public abstract class SelectionListBase var18.addVertexWithUV((double)(var15 - 1), (double)(var20 - 1), 0.0D, 1.0D, 0.0D); var18.addVertexWithUV((double)(var14 + 1), (double)(var20 - 1), 0.0D, 0.0D, 0.0D); var18.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); } this.func_96610_a(var11, var9, var20, var13, var18); } } - GL11.glDisable(GL11.GL_DEPTH_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); byte var19 = 4; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glDisable(GL11.GL_TEXTURE_2D); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDisable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); + EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); var18.startDrawingQuads(); var18.setColorRGBA_I(0, 0); var18.addVertexWithUV((double)this.field_96619_e, (double)(this.field_96616_f + var19), 0.0D, 0.0D, 1.0D); @@ -301,10 +301,10 @@ public abstract class SelectionListBase var18.draw(); } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); } protected int func_96606_e() diff --git a/src/main/java/net/minecraft/src/TextureUtil.java b/src/main/java/net/minecraft/src/TextureUtil.java index 989e1fa..4f2b9a8 100644 --- a/src/main/java/net/minecraft/src/TextureUtil.java +++ b/src/main/java/net/minecraft/src/TextureUtil.java @@ -6,7 +6,7 @@ import java.nio.IntBuffer; import javax.imageio.ImageIO; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class TextureUtil @@ -17,7 +17,7 @@ public class TextureUtil public static int glGenTextures() { - return GL11.glGenTextures(); + return EaglerAdapter.glGenTextures(); } public static int uploadTextureImage(int par0, BufferedImage par1BufferedImage) @@ -44,7 +44,7 @@ public class TextureUtil var10 = Math.min(var7, par2 - var9); int var11 = par1 * var10; copyToBufferPos(par0ArrayOfInteger, var8, var11); - GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, par3, par4 + var9, par1, var10, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); + EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par3, par4 + var9, par1, var10, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); } } @@ -57,7 +57,7 @@ public class TextureUtil public static void allocateTexture(int par0, int par1, int par2) { bindTexture(par0); - GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, par1, par2, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null); + EaglerAdapter.glTexImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, EaglerAdapter.GL_RGBA, par1, par2, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null); } public static int uploadTextureImageSub(int par0, BufferedImage par1BufferedImage, int par2, int par3, boolean par4, boolean par5) @@ -83,7 +83,7 @@ public class TextureUtil int var12 = var5 * var11; par0BufferedImage.getRGB(0, var10, var5, var11, var8, 0, var5); copyToBuffer(var8, var12); - GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, par1, par2 + var10, var5, var11, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); + EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par1, par2 + var10, var5, var11, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); } } @@ -91,13 +91,13 @@ public class TextureUtil { if (par0) { - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_S, EaglerAdapter.GL_CLAMP); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_T, EaglerAdapter.GL_CLAMP); } else { - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_S, EaglerAdapter.GL_REPEAT); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_T, EaglerAdapter.GL_REPEAT); } } @@ -105,13 +105,13 @@ public class TextureUtil { if (par0) { - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MIN_FILTER, EaglerAdapter.GL_LINEAR); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MAG_FILTER, EaglerAdapter.GL_LINEAR); } else { - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MIN_FILTER, EaglerAdapter.GL_NEAREST); + EaglerAdapter.glTexParameteri(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_MAG_FILTER, EaglerAdapter.GL_NEAREST); } } @@ -136,7 +136,7 @@ public class TextureUtil static void bindTexture(int par0) { - GL11.glBindTexture(GL11.GL_TEXTURE_2D, par0); + EaglerAdapter.glBindTexture(EaglerAdapter.GL_TEXTURE_2D, par0); } public static int[] readImageData(ResourceManager par0ResourceManager, TextureLocation par1TextureLocation) throws IOException diff --git a/src/main/java/net/minecraft/src/TileEntityBeaconRenderer.java b/src/main/java/net/minecraft/src/TileEntityBeaconRenderer.java index d6ad9d6..6add532 100644 --- a/src/main/java/net/minecraft/src/TileEntityBeaconRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntityBeaconRenderer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class TileEntityBeaconRenderer extends TileEntitySpecialRenderer { @@ -19,13 +19,13 @@ public class TileEntityBeaconRenderer extends TileEntitySpecialRenderer { Tessellator var10 = Tessellator.instance; this.bindTexture(field_110629_a); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + EaglerAdapter.glTexParameterf(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_S, 10497.0F); + EaglerAdapter.glTexParameterf(EaglerAdapter.GL_TEXTURE_2D, EaglerAdapter.GL_TEXTURE_WRAP_T, 10497.0F); + EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE); float var11 = (float)par1TileEntityBeacon.getWorldObj().getTotalWorldTime() + par8; float var12 = -var11 * 0.2F - (float)MathHelper.floor_float(-var11 * 0.1F); byte var13 = 1; @@ -63,9 +63,9 @@ public class TileEntityBeaconRenderer extends TileEntitySpecialRenderer var10.addVertexWithUV(par2 + var18, par4, par6 + var20, var36, var40); var10.addVertexWithUV(par2 + var18, par4 + var34, par6 + var20, var36, var42); var10.draw(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthMask(false); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glDepthMask(false); var10.startDrawingQuads(); var10.setColorRGBA(255, 255, 255, 32); double var44 = 0.2D; @@ -98,9 +98,9 @@ public class TileEntityBeaconRenderer extends TileEntitySpecialRenderer var10.addVertexWithUV(par2 + var44, par4, par6 + var15, var31, var35); var10.addVertexWithUV(par2 + var44, par4 + var29, par6 + var15, var31, var37); var10.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); + EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); + EaglerAdapter.glDepthMask(true); } } diff --git a/src/main/java/net/minecraft/src/TileEntityChestRenderer.java b/src/main/java/net/minecraft/src/TileEntityChestRenderer.java index 9258151..98c0768 100644 --- a/src/main/java/net/minecraft/src/TileEntityChestRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntityChestRenderer.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.Calendar; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class TileEntityChestRenderer extends TileEntitySpecialRenderer @@ -98,12 +98,12 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer } } - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); - GL11.glScalef(1.0F, -1.0F, -1.0F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); + EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); short var11 = 0; if (var9 == 2) @@ -128,16 +128,16 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer if (var9 == 2 && par1TileEntityChest.adjacentChestXPos != null) { - GL11.glTranslatef(1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(1.0F, 0.0F, 0.0F); } if (var9 == 5 && par1TileEntityChest.adjacentChestZPosition != null) { - GL11.glTranslatef(0.0F, 0.0F, -1.0F); + EaglerAdapter.glTranslatef(0.0F, 0.0F, -1.0F); } - GL11.glRotatef((float)var11, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glRotatef((float)var11, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); float var12 = par1TileEntityChest.prevLidAngle + (par1TileEntityChest.lidAngle - par1TileEntityChest.prevLidAngle) * par8; float var13; @@ -165,9 +165,9 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer var12 = 1.0F - var12 * var12 * var12; var14.chestLid.rotateAngleX = -(var12 * (float)Math.PI / 2.0F); var14.renderAll(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } } diff --git a/src/main/java/net/minecraft/src/TileEntityEnderChestRenderer.java b/src/main/java/net/minecraft/src/TileEntityEnderChestRenderer.java index b30bcf3..8db99d3 100644 --- a/src/main/java/net/minecraft/src/TileEntityEnderChestRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntityEnderChestRenderer.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer @@ -24,12 +24,12 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer } this.bindTexture(field_110637_a); - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); - GL11.glScalef(1.0F, -1.0F, -1.0F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); + EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F); + EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F); short var10 = 0; if (var9 == 2) @@ -52,16 +52,16 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer var10 = -90; } - GL11.glRotatef((float)var10, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + EaglerAdapter.glRotatef((float)var10, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); float var11 = par1TileEntityEnderChest.prevLidAngle + (par1TileEntityEnderChest.lidAngle - par1TileEntityEnderChest.prevLidAngle) * par8; var11 = 1.0F - var11; var11 = 1.0F - var11 * var11 * var11; this.theEnderChestModel.chestLid.rotateAngleX = -(var11 * (float)Math.PI / 2.0F); this.theEnderChestModel.renderAll(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) diff --git a/src/main/java/net/minecraft/src/TileEntityMobSpawnerRenderer.java b/src/main/java/net/minecraft/src/TileEntityMobSpawnerRenderer.java index b28aac0..6bcf506 100644 --- a/src/main/java/net/minecraft/src/TileEntityMobSpawnerRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntityMobSpawnerRenderer.java @@ -1,15 +1,15 @@ package net.minecraft.src; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer { public void renderTileEntityMobSpawner(TileEntityMobSpawner par1TileEntityMobSpawner, double par2, double par4, double par6, float par8) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2 + 0.5F, (float)par4, (float)par6 + 0.5F); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glTranslatef((float)par2 + 0.5F, (float)par4, (float)par6 + 0.5F); func_98144_a(par1TileEntityMobSpawner.getSpawnerLogic(), par2, par4, par6, par8); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } public static void func_98144_a(MobSpawnerBaseLogic par0MobSpawnerBaseLogic, double par1, double par3, double par5, float par7) @@ -20,11 +20,11 @@ public class TileEntityMobSpawnerRenderer extends TileEntitySpecialRenderer { var8.setWorld(par0MobSpawnerBaseLogic.getSpawnerWorld()); float var9 = 0.4375F; - GL11.glTranslatef(0.0F, 0.4F, 0.0F); - GL11.glRotatef((float)(par0MobSpawnerBaseLogic.field_98284_d + (par0MobSpawnerBaseLogic.field_98287_c - par0MobSpawnerBaseLogic.field_98284_d) * (double)par7) * 10.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.4F, 0.0F); - GL11.glScalef(var9, var9, var9); + EaglerAdapter.glTranslatef(0.0F, 0.4F, 0.0F); + EaglerAdapter.glRotatef((float)(par0MobSpawnerBaseLogic.field_98284_d + (par0MobSpawnerBaseLogic.field_98287_c - par0MobSpawnerBaseLogic.field_98284_d) * (double)par7) * 10.0F, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -0.4F, 0.0F); + EaglerAdapter.glScalef(var9, var9, var9); var8.setLocationAndAngles(par1, par3, par5, 0.0F, 0.0F); RenderManager.instance.renderEntityWithPosYaw(var8, 0.0D, 0.0D, 0.0D, 0.0F, par7); } diff --git a/src/main/java/net/minecraft/src/TileEntityRenderer.java b/src/main/java/net/minecraft/src/TileEntityRenderer.java index 1ba7a20..b222dd7 100644 --- a/src/main/java/net/minecraft/src/TileEntityRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntityRenderer.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class TileEntityRenderer { @@ -131,7 +131,7 @@ public class TileEntityRenderer int var4 = var3 % 65536; int var5 = var3 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)var4 / 1.0F, (float)var5 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.renderTileEntityAt(par1TileEntity, (double)par1TileEntity.xCoord - staticPlayerX, (double)par1TileEntity.yCoord - staticPlayerY, (double)par1TileEntity.zCoord - staticPlayerZ, par2); } } diff --git a/src/main/java/net/minecraft/src/TileEntityRendererPiston.java b/src/main/java/net/minecraft/src/TileEntityRendererPiston.java index 5654683..072cd24 100644 --- a/src/main/java/net/minecraft/src/TileEntityRendererPiston.java +++ b/src/main/java/net/minecraft/src/TileEntityRendererPiston.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class TileEntityRendererPiston extends TileEntitySpecialRenderer { @@ -17,17 +17,17 @@ public class TileEntityRendererPiston extends TileEntitySpecialRenderer Tessellator var10 = Tessellator.instance; this.bindTexture(TextureMap.locationBlocksTexture); RenderHelper.disableStandardItemLighting(); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); + EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); if (Minecraft.isAmbientOcclusionEnabled()) { - GL11.glShadeModel(GL11.GL_SMOOTH); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_SMOOTH); } else { - GL11.glShadeModel(GL11.GL_FLAT); + EaglerAdapter.glShadeModel(EaglerAdapter.GL_FLAT); } var10.startDrawingQuads(); diff --git a/src/main/java/net/minecraft/src/TileEntitySignRenderer.java b/src/main/java/net/minecraft/src/TileEntitySignRenderer.java index 8f9f061..830545f 100644 --- a/src/main/java/net/minecraft/src/TileEntitySignRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntitySignRenderer.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class TileEntitySignRenderer extends TileEntitySpecialRenderer { @@ -13,15 +13,15 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer public void renderTileEntitySignAt(TileEntitySign par1TileEntitySign, double par2, double par4, double par6, float par8) { Block var9 = par1TileEntitySign.getBlockType(); - GL11.glPushMatrix(); + EaglerAdapter.glPushMatrix(); float var10 = 0.6666667F; float var12; if (var9 == Block.signPost) { - GL11.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F * var10, (float)par6 + 0.5F); + EaglerAdapter.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F * var10, (float)par6 + 0.5F); float var11 = (float)(par1TileEntitySign.getBlockMetadata() * 360) / 16.0F; - GL11.glRotatef(-var11, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glRotatef(-var11, 0.0F, 1.0F, 0.0F); this.modelSign.signStick.showModel = true; } else @@ -44,23 +44,23 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer var12 = -90.0F; } - GL11.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F * var10, (float)par6 + 0.5F); - GL11.glRotatef(-var12, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.3125F, -0.4375F); + EaglerAdapter.glTranslatef((float)par2 + 0.5F, (float)par4 + 0.75F * var10, (float)par6 + 0.5F); + EaglerAdapter.glRotatef(-var12, 0.0F, 1.0F, 0.0F); + EaglerAdapter.glTranslatef(0.0F, -0.3125F, -0.4375F); this.modelSign.signStick.showModel = false; } this.bindTexture(field_110638_a); - GL11.glPushMatrix(); - GL11.glScalef(var10, -var10, -var10); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glScalef(var10, -var10, -var10); this.modelSign.renderSign(); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); FontRenderer var17 = this.getFontRenderer(); var12 = 0.016666668F * var10; - GL11.glTranslatef(0.0F, 0.5F * var10, 0.07F * var10); - GL11.glScalef(var12, -var12, var12); - GL11.glNormal3f(0.0F, 0.0F, -1.0F * var12); - GL11.glDepthMask(false); + EaglerAdapter.glTranslatef(0.0F, 0.5F * var10, 0.07F * var10); + EaglerAdapter.glScalef(var12, -var12, var12); + EaglerAdapter.glNormal3f(0.0F, 0.0F, -1.0F * var12); + EaglerAdapter.glDepthMask(false); byte var13 = 0; for (int var14 = 0; var14 < par1TileEntitySign.signText.length; ++var14) @@ -78,9 +78,9 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer } } - GL11.glDepthMask(true); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glPopMatrix(); + EaglerAdapter.glDepthMask(true); + EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + EaglerAdapter.glPopMatrix(); } public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) diff --git a/src/main/java/net/minecraft/src/TileEntitySkullRenderer.java b/src/main/java/net/minecraft/src/TileEntitySkullRenderer.java index 552e7f5..db0d95d 100644 --- a/src/main/java/net/minecraft/src/TileEntitySkullRenderer.java +++ b/src/main/java/net/minecraft/src/TileEntitySkullRenderer.java @@ -1,7 +1,7 @@ package net.minecraft.src; import net.lax1dude.eaglercraft.TextureLocation; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; import org.lwjgl.opengl.GL12; public class TileEntitySkullRenderer extends TileEntitySpecialRenderer @@ -60,44 +60,44 @@ public class TileEntitySkullRenderer extends TileEntitySpecialRenderer this.bindTexture(field_110639_f); } - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); + EaglerAdapter.glPushMatrix(); + EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); if (par4 != 1) { switch (par4) { case 2: - GL11.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); + EaglerAdapter.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); break; case 3: - GL11.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); + EaglerAdapter.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); par5 = 180.0F; break; case 4: - GL11.glTranslatef(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); + EaglerAdapter.glTranslatef(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); par5 = 270.0F; break; case 5: default: - GL11.glTranslatef(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); + EaglerAdapter.glTranslatef(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); par5 = 90.0F; } } else { - GL11.glTranslatef(par1 + 0.5F, par2, par3 + 0.5F); + EaglerAdapter.glTranslatef(par1 + 0.5F, par2, par3 + 0.5F); } float var10 = 0.0625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(-1.0F, -1.0F, 1.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); + EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); + EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); + EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); var8.render((Entity)null, 0.0F, 0.0F, 0.0F, par5, 0.0F, var10); - GL11.glPopMatrix(); + EaglerAdapter.glPopMatrix(); } public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) diff --git a/src/main/java/net/minecraft/src/WorldRenderer.java b/src/main/java/net/minecraft/src/WorldRenderer.java index af2349a..e1b2e0b 100644 --- a/src/main/java/net/minecraft/src/WorldRenderer.java +++ b/src/main/java/net/minecraft/src/WorldRenderer.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import net.lax1dude.eaglercraft.adapter.Tessellator; -import org.lwjgl.opengl.GL11; +import net.lax1dude.eaglercraft.EaglerAdapter; public class WorldRenderer { @@ -110,16 +110,16 @@ public class WorldRenderer this.posZMinus = par3 - this.posZClip; float var4 = 6.0F; this.rendererBoundingBox = AxisAlignedBB.getBoundingBox((double)((float)par1 - var4), (double)((float)par2 - var4), (double)((float)par3 - var4), (double)((float)(par1 + 16) + var4), (double)((float)(par2 + 16) + var4), (double)((float)(par3 + 16) + var4)); - GL11.glNewList(this.glRenderList + 2, GL11.GL_COMPILE); + EaglerAdapter.glNewList(this.glRenderList + 2, EaglerAdapter.GL_COMPILE); RenderItem.renderAABB(AxisAlignedBB.getAABBPool().getAABB((double)((float)this.posXClip - var4), (double)((float)this.posYClip - var4), (double)((float)this.posZClip - var4), (double)((float)(this.posXClip + 16) + var4), (double)((float)(this.posYClip + 16) + var4), (double)((float)(this.posZClip + 16) + var4))); - GL11.glEndList(); + EaglerAdapter.glEndList(); this.markDirty(); } } private void setupGLTranslation() { - GL11.glTranslatef((float)this.posXClip, (float)this.posYClip, (float)this.posZClip); + EaglerAdapter.glTranslatef((float)this.posXClip, (float)this.posYClip, (float)this.posZClip); } /** @@ -174,13 +174,13 @@ public class WorldRenderer if (!var14) { var14 = true; - GL11.glNewList(this.glRenderList + var11, GL11.GL_COMPILE); - GL11.glPushMatrix(); + EaglerAdapter.glNewList(this.glRenderList + var11, EaglerAdapter.GL_COMPILE); + EaglerAdapter.glPushMatrix(); this.setupGLTranslation(); float var19 = 1.000001F; - GL11.glTranslatef(-8.0F, -8.0F, -8.0F); - GL11.glScalef(var19, var19, var19); - GL11.glTranslatef(8.0F, 8.0F, 8.0F); + EaglerAdapter.glTranslatef(-8.0F, -8.0F, -8.0F); + EaglerAdapter.glScalef(var19, var19, var19); + EaglerAdapter.glTranslatef(8.0F, 8.0F, 8.0F); tessellator.startDrawingQuads(); tessellator.setTranslation((double)(-this.posX), (double)(-this.posY), (double)(-this.posZ)); } @@ -218,8 +218,8 @@ public class WorldRenderer if (var14) { this.bytesDrawn += tessellator.draw(); - GL11.glPopMatrix(); - GL11.glEndList(); + EaglerAdapter.glPopMatrix(); + EaglerAdapter.glEndList(); tessellator.setTranslation(0.0D, 0.0D, 0.0D); } else @@ -300,7 +300,7 @@ public class WorldRenderer */ public void callOcclusionQueryList() { - GL11.glCallList(this.glRenderList + 2); + EaglerAdapter.glCallList(this.glRenderList + 2); } /**